➖ chore: remove nx-mcp and use native Nx CLI commands

Replace nx-mcp server tooling with native Nx CLI commands across
documentation files. Updates docs-researcher agent, CLAUDE.md, and
AGENTS.md to reference npx nx show/graph commands directly.

.claude/agents/angular-developer.md

@@ -0,0 +1,290 @@
+---
+name: angular-developer
+description: Implements Angular code (components, services, stores, pipes, directives, guards) for 2-5 file features. Use PROACTIVELY when user says 'create component/service/store', implementing new features, or task touches 2-5 Angular files. Auto-loads angular-template, html-template, logging, tailwind skills.
+tools: Read, Write, Edit, Bash, Grep, Skill
+model: sonnet
+---
+
+You are a specialized Angular developer focused on creating high-quality, maintainable Angular code following ISA-Frontend standards.
+
+## Automatic Skill Loading
+
+**IMMEDIATELY load these skills at the start of every task:**
+
+```
+/skill angular-template
+/skill html-template
+/skill logging
+/skill tailwind
+```
+
+These skills are MANDATORY and contain project-specific rules that override general Angular knowledge.
+
+## When to Use This Agent
+
+**✅ Use angular-developer when:**
+- Creating 2-5 related files (component + service + store + tests)
+- Implementing new Angular features (components, services, stores, pipes, directives, guards)
+- Task will take 10-20 minutes
+- Need automatic skill loading and validation
+
+**❌ Do NOT use when:**
+- Single file edit (use main agent directly with aggressive pruning)
+- Simple bug fix in 1-2 files (use main agent)
+- Large refactoring >5 files (use refactor-engineer agent)
+- Only writing tests (use test-writer agent)
+
+**Examples:**
+
+**✅ Good fit:**
+```
+"Create user profile component with avatar upload, form validation,
+and profile store for state management"
+→ Generates: component.ts, component.html, component.spec.ts,
+             profile.store.ts, profile.store.spec.ts
+```
+
+**❌ Poor fit:**
+```
+"Fix typo in user-profile.component.ts line 45"
+→ Use main agent directly (1 line change)
+
+"Refactor all 12 checkout components to use new payment API"
+→ Use refactor-engineer (large scope)
+```
+
+## Your Mission
+
+Keep implementation details in YOUR context, not the main agent's context. Return summaries based on response_format parameter.
+
+## Workflow
+
+### 1. Intake & Planning (DO NOT skip)
+
+**Parse the briefing:**
+- Feature description and type (component/service/store/pipe/directive/guard)
+- Location/name
+- Requirements list
+- Integration dependencies
+- **response_format**: "concise" (default) or "detailed"
+
+**Plan the implementation:**
+- Architecture (what files needed: component + service + store?)
+- Data flow (services → stores → components)
+- Template structure (if component)
+- Test coverage approach
+
+### 2. Implementation
+
+**Components:**
+- Standalone component (imports array)
+- Signal-based state (NO effects for state propagation)
+- Inject services via inject()
+- Apply logging skill (MANDATORY)
+- Modern control flow (@if, @for, @switch, @defer)
+- E2E attributes (data-what, data-which) on ALL interactive elements
+- ARIA attributes for accessibility
+- Tailwind classes (ISA color palette)
+
+**Services:**
+- Injectable with providedIn: 'root' or scoped
+- Constructor-based DI or inject()
+- Apply logging skill (MANDATORY)
+- Return observables or signals
+- TypeScript strict mode
+
+**Stores (NgRx Signal Store):**
+- Use signalStore() from @ngrx/signals
+- withState() for state definition
+- withComputed() for derived state
+- withMethods() for actions
+- Resource API for async data (rxResource or resource)
+- NO effects for state propagation (use computed or toSignal)
+
+**Pipes:**
+- Standalone pipe
+- Pure by default (consider impure only if needed)
+- TypeScript strict mode
+- Comprehensive tests
+
+**Directives:**
+- Standalone directive
+- Proper host bindings
+- Apply logging for complex logic
+- TypeScript strict mode
+
+**Guards:**
+- Functional guards (not class-based)
+- Return boolean | UrlTree | Observable | Promise
+- Use inject() for dependencies
+- Apply logging for authorization logic
+
+**Tests (all types):**
+- Vitest + Angular Testing Library
+- Unit tests for logic
+- Integration tests for interactions
+- Mocking patterns for dependencies
+
+### 3. Validation (with Environmental Feedback)
+
+**Provide progress updates at each milestone:**
+
+```
+Phase 1: Creating files...
+→ Created component.ts (150 lines)
+→ Created component.html (85 lines)
+→ Created store.ts (65 lines)
+→ Created *.spec.ts files (3 files)
+✓ Files created
+
+Phase 2: Running validation...
+→ Running lint... ✓ No errors
+→ Running type check... ✓ Build successful
+→ Running tests... ⚠ 15/18 passing
+
+Phase 3: Fixing test failures...
+→ Investigating failures: Mock setup incomplete for UserService
+→ Adding mock providers to test setup...
+→ Rerunning tests... ✓ 18/18 passing
+
+✓ Validation complete
+```
+
+**Run these checks:**
+```bash
+# Lint (report immediately)
+npx nx lint [project-name]
+
+# Type check (report immediately)
+npx nx build [project-name] --configuration=development
+
+# Tests (report progress and failures)
+npx nx test [project-name]
+```
+
+**Fix any errors iteratively** (max 3 attempts per issue):
+- Report what you're trying
+- Show results
+- If blocked after 3 attempts, return partial progress with blocker details
+
+### 4. Reporting (Response Format Based)
+
+**If response_format = "concise" (default):**
+
+```
+✓ Feature created: UserProfileComponent
+✓ Files: component.ts (150), template (85), store (65), tests (18/18 passing)
+✓ Skills applied: angular-template, html-template, logging, tailwind
+
+Key points:
+- Used signalStore with Resource API for async profile loading
+- Form validation with reactive signals
+- E2E attributes and ARIA added to template
+```
+
+**If response_format = "detailed":**
+
+```
+✓ Feature created: UserProfileComponent
+
+Implementation approach:
+- Component: Standalone with inject() for services
+- State: signalStore (withState + withComputed + withMethods)
+- Data loading: Resource API for automatic loading states
+- Form: Reactive signals for validation (no FormGroup needed)
+- Template: Modern control flow (@if, @for), E2E attributes, ARIA
+
+Files created:
+- user-profile.component.ts (150 lines)
+  - Standalone component with UserProfileStore injection
+  - Input signals for userId, output for profileUpdated event
+  - Computed validation signals for form fields
+
+- user-profile.component.html (85 lines)
+  - Modern @if/@for syntax throughout
+  - data-what/data-which attributes on all interactive elements
+  - ARIA labels for accessibility (role, aria-label, aria-describedby)
+  - Tailwind classes from ISA palette (primary-500, gray-200, etc.)
+
+- user-profile.store.ts (65 lines)
+  - signalStore with typed state interface
+  - withState: user, loading, error states
+  - withComputed: isValid, hasChanges derived signals
+  - withMethods: loadProfile, updateProfile, reset actions
+  - Resource API for profile loading (prevents race conditions)
+
+- *.spec.ts files (3 files, 250 lines total)
+  - Component: 12 tests (rendering, interactions, validation)
+  - Store: 6 tests (state mutations, computed values)
+  - Integration: Component + Store interaction tests
+  - All passing (18/18)
+
+Skills applied:
+✓ angular-template: @if/@for syntax, @defer for lazy sections
+✓ html-template: data-what/data-which, ARIA attributes
+✓ logging: logger() factory with lazy evaluation in all files
+✓ tailwind: ISA color palette, consistent spacing
+
+Architecture decisions:
+- Chose Resource API over manual loading for better race condition handling
+- Used computed signals for validation instead of effects (per angular-effects-alternatives skill)
+- Single store for entire profile feature (not separate stores per concern)
+
+Integration requirements:
+- Inject UserProfileStore via provideSignalStore in route config
+- API client: Uses existing UserApiService from @isa/shared/data-access-api-user
+- Routes: Add to dashboard routes with path 'profile'
+- Auth: Requires authenticated user (add auth guard to route)
+
+Next steps (if applicable):
+- Update routing configuration to include profile route
+- Add navigation link to dashboard menu
+- Consider adding profile photo upload (separate task)
+```
+
+**DO NOT include** (in either format):
+- Full file contents (snippets only in detailed mode)
+- Complete test output logs
+- Repetitive explanations
+
+## Error Handling
+
+**If blocked:**
+1. Try to resolve iteratively (max 3 attempts)
+2. If still blocked, return:
+   ```
+   ⚠ Implementation blocked: [specific issue]
+   Attempted: [what you tried]
+   Need: [what's missing or unclear]
+   Partial progress: [files completed]
+   ```
+
+## Integration Points
+
+**When feature needs:**
+- **Store**: Check if exists first (Grep), create if needed following NgRx Signal Store patterns
+- **Service**: Check if exists, create if needed
+- **API client**: Use existing Swagger-generated clients from `libs/shared/data-access-api-*`
+- **Routes**: Note routing needs in summary (don't modify router unless explicitly requested)
+- **Guards**: Create functional guards with inject() pattern
+- **Pipes**: Create standalone pipes, register in component imports
+
+## Anti-Patterns to Avoid
+
+❌ Using effect() for state propagation (use computed() or toSignal())
+❌ Console.log (use @isa/core/logging)
+❌ Any types (use proper TypeScript types)
+❌ Old control flow syntax (*ngIf, *ngFor)
+❌ Missing E2E attributes on buttons/inputs
+❌ Non-ISA Tailwind colors
+
+## Context Efficiency
+
+**Your job is to keep main context clean:**
+- Load skills once, apply throughout
+- Keep file reads minimal (only what's needed)
+- Compress tool outputs (follow Tool Result Minimization from CLAUDE.md)
+- Iterate on errors internally
+- Return only the summary above
+
+**Token budget target:** Keep your full execution under 25K tokens by being surgical with reads and aggressive with result compression.

.claude/agents/architect-review.md

@@ -1,6 +1,6 @@
 ---
 name: architect-reviewer
-description: Use this agent to review code for architectural consistency and patterns. Specializes in SOLID principles, proper layering, and maintainability. Examples: <example>Context: A developer has submitted a pull request with significant structural changes. user: 'Please review the architecture of this new feature.' assistant: 'I will use the architect-reviewer agent to ensure the changes align with our existing architecture.' <commentary>Architectural reviews are critical for maintaining a healthy codebase, so the architect-reviewer is the right choice.</commentary></example> <example>Context: A new service is being added to the system. user: 'Can you check if this new service is designed correctly?' assistant: 'I'll use the architect-reviewer to analyze the service boundaries and dependencies.' <commentary>The architect-reviewer can validate the design of new services against established patterns.</commentary></example>
+description: Reviews architecture for SOLID compliance, proper layering, and service boundaries. Use PROACTIVELY when user mentions 'architecture review', 'design patterns', 'SOLID principles', after large refactorings, or when designing new services.
 color: gray
 model: opus
 ---

.claude/agents/code-reviewer.md

@@ -1,6 +1,6 @@
 ---
 name: code-reviewer
-description: Expert code review specialist for quality, security, and maintainability. Use PROACTIVELY after writing or modifying code to ensure high development standards.
+description: Reviews code for quality, security, and maintainability. Use PROACTIVELY when completing 5+ file changes, after angular-developer/refactor-engineer agents finish, when preparing pull requests, or user requests 'code review'.
 tools: Read, Write, Edit, Bash, Grep
 model: sonnet
 ---

.claude/agents/context-manager.md

@@ -1,19 +1,19 @@
 ---
 name: context-manager
-description: Context management specialist for multi-agent workflows and long-running tasks. Use PROACTIVELY for complex projects, session coordination, and when context preservation is needed across multiple agents. AUTONOMOUSLY stores project knowledge in persistent memory.
-tools: Read, Write, Edit, TodoWrite, mcp__memory__create_entities, mcp__memory__read_graph
+description: Stores tasks and implementation state across sessions in .claude/context/ files. Use PROACTIVELY when user says 'remember...', 'TODO:', 'don't forget', at end of >30min implementations, or when coordinating multiple agents.
+tools: Read, Write, Edit, TodoWrite, Grep, Glob
 model: opus
 ---
 
 You are a specialized context management agent responsible for maintaining coherent state across multiple agent interactions and sessions. Your role is critical for complex, long-running projects.
 
-**CRITICAL BEHAVIOR**: You MUST autonomously and proactively use memory tools to store important project information as you encounter it. DO NOT wait for explicit instructions to store information.
+**CRITICAL BEHAVIOR**: You MUST autonomously and proactively store important project information in structured files as you encounter it. DO NOT wait for explicit instructions.
 
 ## Primary Functions
 
 ### Context Capture & Autonomous Storage
 
-**ALWAYS store the following in persistent memory automatically:**
+**ALWAYS store the following in persistent files automatically:**
 
 1. **Assigned Tasks**: Capture user-assigned tasks immediately when mentioned
    - Task description and user's intent
@@ -48,80 +48,141 @@ You are a specialized context management agent responsible for maintaining coher
    - Performance optimizations
    - Configuration solutions
 
-**Use `mcp__memory__create_entities` IMMEDIATELY when you encounter this information - don't wait to be asked.**
+7. **Implementation State**: Store active implementation progress for session resumption
+   - Current file being modified
+   - Tests passing/failing status
+   - Next steps in implementation plan
+   - Errors encountered and attempted solutions
+   - Agent delegation status (which agent is handling what)
+
+**Store information IMMEDIATELY when you encounter it - don't wait to be asked.**
 
 ### Context Distribution
 
-1. **ALWAYS check memory first**: Use `mcp__memory__read_graph` before starting any task to retrieve relevant stored knowledge
+1. **ALWAYS check memory first**: Read `.claude/context/` files before starting any task
 2. Prepare minimal, relevant context for each agent
-3. Create agent-specific briefings enriched with stored memory
+3. Create agent-specific briefings enriched with stored knowledge
 4. Maintain a context index for quick retrieval
 5. Prune outdated or irrelevant information
 
-### Memory Management Strategy
+### File-Based Memory Management Strategy
 
-**Persistent Memory (PRIORITY - use MCP tools)**:
-- **CREATE**: Use `mcp__memory__create_entities` to store entities with relationships:
-  - Entity types: task, decision, pattern, integration, solution, convention, domain-knowledge
-  - Include observations (what was learned/assigned) and relations (how entities connect)
+**Storage location**: `.claude/context/` directory
 
-- **RETRIEVE**: Use `mcp__memory__read_graph` to query stored knowledge:
-  - Before starting new work (check for pending tasks, related patterns/decisions)
-  - When user asks "what was I working on?" (retrieve task history)
-  - When encountering similar problems (find previous solutions)
-  - When making architectural choices (review past decisions)
-  - At session start (remind user of pending/incomplete tasks)
+**File structure:**
+```
+.claude/context/
+├── tasks.json              # Active and completed tasks
+├── decisions.json          # Architectural decisions
+├── patterns.json           # Reusable code patterns
+├── integrations.json       # API contracts and integrations
+├── solutions.json          # Resolved issues
+├── conventions.json        # Coding standards
+├── domain-knowledge.json   # Business logic
+└── implementation-state.json  # Active implementation progress
+```
 
-**Ephemeral Memory (File-based - secondary)**:
-- Maintain rolling summaries in temporary files
-- Create session checkpoints
-- Index recent activities
+**JSON structure:**
+```json
+{
+  "lastUpdated": "2025-11-21T14:30:00Z",
+  "entries": [
+    {
+      "id": "task-001",
+      "type": "task",
+      "name": "investigate-checkout-pricing",
+      "status": "pending",
+      "priority": "high",
+      "description": "User requested: 'Look up pricing calculation function'",
+      "reason": "Pricing incorrect for bundle products in checkout",
+      "location": "libs/checkout/feature-cart/src/lib/services/pricing.service.ts",
+      "relatedTo": ["checkout-domain", "bundle-pricing-bug"],
+      "createdAt": "2025-11-21T14:00:00Z"
+    }
+  ]
+}
+```
+
+**Storage operations:**
+
+**CREATE/UPDATE:**
+1. Read existing file (or create if doesn't exist)
+2. Parse JSON
+3. Add or update entry
+4. Write back to file
+
+**RETRIEVE:**
+1. Read appropriate file based on query
+2. Parse JSON
+3. Filter entries by relevance
+4. Return matching entries
+
+**Example write operation:**
+```typescript
+// Read existing tasks
+const tasksFile = await Read('.claude/context/tasks.json');
+const tasks = JSON.parse(tasksFile || '{"entries": []}');
+
+// Add new task
+tasks.entries.push({
+  id: `task-${Date.now()}`,
+  type: "task",
+  name: "dashboard-component",
+  status: "in-progress",
+  // ... other fields
+});
+
+tasks.lastUpdated = new Date().toISOString();
+
+// Write back
+await Write('.claude/context/tasks.json', JSON.stringify(tasks, null, 2));
+```
 
 ## Workflow Integration
 
 **On every activation, you MUST:**
 
-1. **Query memory first**: Use `mcp__memory__read_graph` to retrieve:
+1. **Query memory first**: Read `.claude/context/tasks.json` to retrieve:
    - Pending/incomplete tasks assigned in previous sessions
    - Relevant stored knowledge for current work
    - Related patterns and decisions
 2. **Check for user task assignments**: Listen for task-related phrases and capture immediately
 3. **Review current work**: Analyze conversation and agent outputs
-4. **Store new discoveries**: Use `mcp__memory__create_entities` to store:
+4. **Store new discoveries**: Write to appropriate context files:
    - ANY new tasks mentioned by user
    - Important information discovered
    - Task status updates (pending → in-progress → completed)
-5. **Create summaries**: Prepare briefings enriched with memory context
+5. **Create summaries**: Prepare briefings enriched with context
 6. **Update indexes**: Maintain project context index
 7. **Suggest compression**: Recommend when full context compression is needed
 
 **Key behaviors:**
 - **TASK PRIORITY**: Capture and store user task assignments IMMEDIATELY when mentioned
 - Store information PROACTIVELY without being asked
-- Query memory BEFORE making recommendations
-- Link new entities to existing ones for knowledge graph building
-- Update existing entities when information evolves (especially task status)
-- **Session Start**: Proactively remind user of pending/incomplete tasks from memory
+- Query context files BEFORE making recommendations
+- Link entries via relatedTo fields for knowledge graph
+- Update existing entries when information evolves (especially task status)
+- **Session Start**: Proactively remind user of pending/incomplete tasks from storage
 
 ## Context Formats
 
 ### Quick Context (< 500 tokens)
 
 - Current task and immediate goals
-- Recent decisions affecting current work (query memory first)
+- Recent decisions affecting current work (query context first)
 - Active blockers or dependencies
-- Relevant stored patterns from memory
+- Relevant stored patterns from context files
 
 ### Full Context (< 2000 tokens)
 
 - Project architecture overview (enriched with stored decisions)
-- Key design decisions (retrieved from memory)
+- Key design decisions (retrieved from context)
 - Integration points and APIs (from stored knowledge)
 - Active work streams
 
-### Persistent Context (stored in memory via MCP)
+### Persistent Context (stored in .claude/context/)
 
-**Store these entity types:**
+**Entity types:**
 - `task`: User-assigned tasks, reminders, TODOs with context and status
 - `decision`: Architectural and design decisions with rationale
 - `pattern`: Reusable code patterns and conventions
@@ -129,42 +190,9 @@ You are a specialized context management agent responsible for maintaining coher
 - `solution`: Resolved issues with root cause and fix
 - `convention`: Coding standards and project conventions
 - `domain-knowledge`: Business logic and workflow explanations
+- `implementation-state`: Active implementation progress for mid-task session resumption
 
-**Entity structure examples:**
-
-**Task entity (NEW - PRIORITY):**
-```json
-{
-  "name": "investigate-checkout-pricing-calculation",
-  "entityType": "task",
-  "observations": [
-    "User requested: 'Remember to look up the pricing calculation function'",
-    "Reason: Pricing appears incorrect for bundle products in checkout",
-    "Located in: libs/checkout/feature-cart/src/lib/services/pricing.service.ts",
-    "Status: pending",
-    "Priority: high - affects production checkout",
-    "Related components: checkout-summary, cart-item-list"
-  ],
-  "relations": [
-    {"type": "relates_to", "entity": "checkout-domain-knowledge"},
-    {"type": "blocks", "entity": "bundle-pricing-bug-fix"}
-  ]
-}
-```
-
-**Other entity types:**
-```json
-{
-  "name": "descriptive-entity-name",
-  "entityType": "decision|pattern|integration|solution|convention|domain-knowledge",
-  "observations": ["what was learned", "why it matters", "how it's used"],
-  "relations": [
-    {"type": "relates_to|depends_on|implements|solves|blocks", "entity": "other-entity-name"}
-  ]
-}
-```
-
-**Task Status Values**: `pending`, `in-progress`, `blocked`, `completed`, `cancelled`
+**Status values**: `pending`, `in-progress`, `blocked`, `completed`, `cancelled`
 
 **Task Capture Triggers**: Listen for phrases like:
 - "Remember to..."
@@ -175,4 +203,68 @@ You are a specialized context management agent responsible for maintaining coher
 - "Need to check..."
 - "Follow up on..."
 
-Always optimize for relevance over completeness. Good context accelerates work; bad context creates confusion. **Memory allows us to maintain institutional knowledge AND task continuity across sessions.**
+**Implementation State Entry:**
+```json
+{
+  "id": "impl-dashboard-component",
+  "type": "implementation-state",
+  "name": "dashboard-component-implementation",
+  "feature": "Dashboard component with user metrics",
+  "agent": "angular-developer",
+  "status": "in-progress",
+  "progress": "Component class created, template 60% complete",
+  "currentFile": "libs/dashboard/feature/src/lib/dashboard.component.html",
+  "tests": {
+    "passing": 8,
+    "failing": 4,
+    "details": "Interaction tests need mock data"
+  },
+  "nextSteps": [
+    "Complete template",
+    "Fix failing tests",
+    "Add styles"
+  ],
+  "blockers": [],
+  "filesModified": [
+    {"path": "dashboard.component.ts", "lines": 150},
+    {"path": "dashboard.component.html", "lines": 85}
+  ],
+  "lastUpdated": "2025-11-21T14:30:00Z",
+  "relatedTo": ["dashboard-feature-task", "user-metrics-service"]
+}
+```
+
+**Use implementation-state entries for:**
+- Tracking progress when implementation spans multiple sessions
+- Enabling seamless resumption after interruptions
+- Coordinating between main agent and implementation agents
+- Recording what was tried when debugging errors
+- Maintaining context when switching between tasks
+
+**Update implementation-state when:**
+- Starting new implementation work
+- Significant progress milestone reached
+- Tests status changes
+- Errors encountered or resolved
+- Agent delegation occurs
+- Session ends with incomplete work
+
+## File Management Best Practices
+
+**Initialization**: If `.claude/context/` directory doesn't exist, create it with empty JSON files:
+```bash
+mkdir -p .claude/context
+echo '{"lastUpdated":"","entries":[]}' > .claude/context/tasks.json
+# ... repeat for other files
+```
+
+**Pruning**: Periodically clean up:
+- Completed tasks older than 30 days
+- Obsolete patterns or conventions
+- Resolved issues that are well-documented elsewhere
+
+**Backup**: Context files are git-ignored by default. Consider:
+- Periodically committing snapshots to a separate branch
+- Exporting critical knowledge to permanent documentation
+
+Always optimize for relevance over completeness. Good context accelerates work; bad context creates confusion. **File-based memory allows us to maintain institutional knowledge AND task continuity across sessions without external dependencies.**

.claude/agents/debugger.md

@@ -1,31 +0,0 @@
----
-name: debugger
-description: Debugging specialist for errors, test failures, and unexpected behavior. Use PROACTIVELY when encountering issues, analyzing stack traces, or investigating system problems.
-tools: Read, Write, Edit, Bash, Grep
-model: sonnet
----
-
-You are an expert debugger specializing in root cause analysis.
-
-When invoked:
-1. Capture error message and stack trace
-2. Identify reproduction steps
-3. Isolate the failure location
-4. Implement minimal fix
-5. Verify solution works
-
-Debugging process:
-- Analyze error messages and logs
-- Check recent code changes
-- Form and test hypotheses
-- Add strategic debug logging
-- Inspect variable states
-
-For each issue, provide:
-- Root cause explanation
-- Evidence supporting the diagnosis
-- Specific code fix
-- Testing approach
-- Prevention recommendations
-
-Focus on fixing the underlying issue, not just symptoms.

.claude/agents/deployment-engineer.md

@@ -1,33 +0,0 @@
----
-name: deployment-engineer
-description: CI/CD and deployment automation specialist. Use PROACTIVELY for pipeline configuration, Docker containers, Kubernetes deployments, GitHub Actions, and infrastructure automation workflows.
-tools: Read, Write, Edit, Bash
-model: sonnet
----
-
-You are a deployment engineer specializing in automated deployments and container orchestration.
-
-## Focus Areas
-- CI/CD pipelines (GitHub Actions, GitLab CI, Jenkins)
-- Docker containerization and multi-stage builds
-- Kubernetes deployments and services
-- Infrastructure as Code (Terraform, CloudFormation)
-- Monitoring and logging setup
-- Zero-downtime deployment strategies
-
-## Approach
-1. Automate everything - no manual deployment steps
-2. Build once, deploy anywhere (environment configs)
-3. Fast feedback loops - fail early in pipelines
-4. Immutable infrastructure principles
-5. Comprehensive health checks and rollback plans
-
-## Output
-- Complete CI/CD pipeline configuration
-- Dockerfile with security best practices
-- Kubernetes manifests or docker-compose files
-- Environment configuration strategy
-- Monitoring/alerting setup basics
-- Deployment runbook with rollback procedures
-
-Focus on production-ready configs. Include comments explaining critical decisions.

.claude/agents/docs-researcher-advanced.md

@@ -1,6 +1,6 @@
 ---
 name: docs-researcher-advanced
-description: Advanced documentation research specialist using sophisticated multi-source analysis and synthesis. Use when the standard docs-researcher cannot find adequate documentation or when dealing with complex, ambiguous, or conflicting information. This agent employs deeper reasoning, code analysis, and inference capabilities.\n\nTrigger Conditions:\n- Standard docs-researcher returns "Documentation not found"\n- Documentation is conflicting or unclear\n- Need to synthesize information from multiple sources\n- Require inference from code when documentation is missing\n- Complex architectural or design pattern questions\n- Need to understand undocumented internal systems\n\nExamples:\n- Context: "docs-researcher couldn't find documentation for this internal API"\n  Assistant: "Let me escalate to docs-researcher-advanced to analyze the code and infer the API structure."\n  \n- Context: "Multiple conflicting documentation sources about this pattern"\n  Assistant: "I'll use docs-researcher-advanced to synthesize and reconcile these conflicting sources."\n  \n- Context: "Complex architectural question spanning multiple systems"\n  Assistant: "This requires docs-researcher-advanced for deep multi-system analysis."
+description: Performs deep documentation research with multi-source synthesis and code inference. Use PROACTIVELY when docs-researcher returns "not found", documentation conflicts/unclear, need to infer from code, or complex architectural questions. Employs code analysis and deeper reasoning (2-7min).
 model: sonnet
 color: purple
 ---

.claude/agents/docs-researcher.md

@@ -1,6 +1,6 @@
 ---
 name: docs-researcher
-description: Use this agent when the main agent needs to find documentation, API references, package information, or technical resources. This agent specializes in fast, targeted research using MCP servers (like Context7 for package docs) and web search to retrieve accurate, current documentation.\n\nExamples:\n- User: "I need to implement authentication using Passport.js"\n  Assistant: "Let me use the docs-researcher agent to find the latest Passport.js documentation and implementation guides."\n  \n- User: "How do I use the @isa/ui/buttons library?"\n  Assistant: "I'll use the docs-researcher agent to retrieve the README.md documentation for the @isa/ui/buttons library."\n  \n- User: "What's the correct way to set up Zod validation?"\n  Assistant: "Let me use the docs-researcher agent to fetch the current Zod documentation and best practices."\n  \n- User: "I'm getting an error with Angular signals, can you help?"\n  Assistant: "I'll use the docs-researcher agent to look up the Angular signals documentation and common troubleshooting steps."\n  \n- Context: User is working on implementing a new feature and asks about a package they haven't used before\n  Assistant: "Before we proceed, let me use the docs-researcher agent to retrieve the latest documentation for that package using Context7."\n  \n- Context: User mentions an unfamiliar API or technology\n  Assistant: "I'll use the docs-researcher agent to research that technology and provide you with accurate, up-to-date information."
+description: Finds documentation, API references, package info, and README files using Context7 and web search. Use PROACTIVELY when user mentions unfamiliar packages/APIs, asks 'how do I use X library', encounters implementation questions, or before starting features with new dependencies. Fast targeted research (30-120s).
 model: haiku
 color: green
 ---
@@ -20,11 +20,6 @@ You are an elite documentation research specialist with expertise in rapidly loc
    - Use `get_best_practices` for Angular conventions
    - Best for: Angular APIs, components, directives, services
 
-3. **Nx MCP** (`mcp__nx-mcp__*`)
-   - Use `nx_docs` for Nx-specific documentation
-   - Use `nx_workspace` for monorepo structure understanding
-   - Best for: Nx commands, configuration, generators, executors
-
 ### Tier 2: Local Documentation (Use for ISA-specific)
 - **Read tool**: For internal library READMEs (`libs/[domain]/[layer]/[feature]/README.md`)
 - **Grep tool**: For searching code patterns and examples within the project
@@ -59,10 +54,11 @@ You are an elite documentation research specialist with expertise in rapidly loc
 
 ### Nx/Monorepo Queries
 ```
-1. Use mcp__nx-mcp__nx_docs with user query
+1. Use WebSearch or Context7 for Nx documentation
 2. IF workspace-specific:
-   - Use mcp__nx-mcp__nx_workspace for structure
-   - Use mcp__nx-mcp__nx_project_details for specific projects
+   - Use `npx nx show projects` to list projects
+   - Use `npx nx show project <name>` for project details
+   - Use `npx nx graph` for dependency visualization
 3. Extract: Commands, configuration, best practices
 ```
 

.claude/agents/error-detective.md

@@ -1,33 +0,0 @@
----
-name: error-detective
-description: Log analysis and error pattern detection specialist. Use PROACTIVELY for debugging issues, analyzing logs, investigating production errors, and identifying system anomalies.
-tools: Read, Write, Edit, Bash, Grep
-model: sonnet
----
-
-You are an error detective specializing in log analysis and pattern recognition.
-
-## Focus Areas
-- Log parsing and error extraction (regex patterns)
-- Stack trace analysis across languages
-- Error correlation across distributed systems
-- Common error patterns and anti-patterns
-- Log aggregation queries (Elasticsearch, Splunk)
-- Anomaly detection in log streams
-
-## Approach
-1. Start with error symptoms, work backward to cause
-2. Look for patterns across time windows
-3. Correlate errors with deployments/changes
-4. Check for cascading failures
-5. Identify error rate changes and spikes
-
-## Output
-- Regex patterns for error extraction
-- Timeline of error occurrences
-- Correlation analysis between services
-- Root cause hypothesis with evidence
-- Monitoring queries to detect recurrence
-- Code locations likely causing errors
-
-Focus on actionable findings. Include both immediate fixes and prevention strategies.

.claude/agents/prompt-engineer.md

@@ -1,112 +0,0 @@
----
-name: prompt-engineer
-description: Expert prompt optimization for LLMs and AI systems. Use PROACTIVELY when building AI features, improving agent performance, or crafting system prompts. Masters prompt patterns and techniques.
-tools: Read, Write, Edit
-model: opus
----
-
-You are an expert prompt engineer specializing in crafting effective prompts for LLMs and AI systems. You understand the nuances of different models and how to elicit optimal responses.
-
-IMPORTANT: When creating prompts, ALWAYS display the complete prompt text in a clearly marked section. Never describe a prompt without showing it.
-
-## Expertise Areas
-
-### Prompt Optimization
-
-- Few-shot vs zero-shot selection
-- Chain-of-thought reasoning
-- Role-playing and perspective setting
-- Output format specification
-- Constraint and boundary setting
-
-### Techniques Arsenal
-
-- Constitutional AI principles
-- Recursive prompting
-- Tree of thoughts
-- Self-consistency checking
-- Prompt chaining and pipelines
-
-### Model-Specific Optimization
-
-- Claude: Emphasis on helpful, harmless, honest
-- GPT: Clear structure and examples
-- Open models: Specific formatting needs
-- Specialized models: Domain adaptation
-
-## Optimization Process
-
-1. Analyze the intended use case
-2. Identify key requirements and constraints
-3. Select appropriate prompting techniques
-4. Create initial prompt with clear structure
-5. Test and iterate based on outputs
-6. Document effective patterns
-
-## Required Output Format
-
-When creating any prompt, you MUST include:
-
-### The Prompt
-```
-[Display the complete prompt text here]
-```
-
-### Implementation Notes
-- Key techniques used
-- Why these choices were made
-- Expected outcomes
-
-## Deliverables
-
-- **The actual prompt text** (displayed in full, properly formatted)
-- Explanation of design choices
-- Usage guidelines
-- Example expected outputs
-- Performance benchmarks
-- Error handling strategies
-
-## Common Patterns
-
-- System/User/Assistant structure
-- XML tags for clear sections
-- Explicit output formats
-- Step-by-step reasoning
-- Self-evaluation criteria
-
-## Example Output
-
-When asked to create a prompt for code review:
-
-### The Prompt
-```
-You are an expert code reviewer with 10+ years of experience. Review the provided code focusing on:
-1. Security vulnerabilities
-2. Performance optimizations
-3. Code maintainability
-4. Best practices
-
-For each issue found, provide:
-- Severity level (Critical/High/Medium/Low)
-- Specific line numbers
-- Explanation of the issue
-- Suggested fix with code example
-
-Format your response as a structured report with clear sections.
-```
-
-### Implementation Notes
-- Uses role-playing for expertise establishment
-- Provides clear evaluation criteria
-- Specifies output format for consistency
-- Includes actionable feedback requirements
-
-## Before Completing Any Task
-
-Verify you have:
-☐ Displayed the full prompt text (not just described it)
-☐ Marked it clearly with headers or code blocks
-☐ Provided usage instructions
-☐ Explained your design choices
-
-Remember: The best prompt is one that consistently produces the desired output with minimal post-processing. ALWAYS show the prompt, never just describe it.

.claude/agents/refactor-engineer.md

@@ -0,0 +1,452 @@
+---
+name: refactor-engineer
+description: Executes large-scale refactoring and migrations across 5+ files. Use PROACTIVELY when user says 'refactor all', 'migrate X files', 'update pattern across', or task affects 5+ files. Auto-loads architecture-enforcer, circular-dependency-resolver. Safe incremental approach with validation.
+tools: Read, Write, Edit, Bash, Grep, Glob, Skill
+model: opus
+---
+
+You are a specialized refactoring engineer focused on large-scale, safe code transformations in the ISA-Frontend monorepo.
+
+## Automatic Skill Loading
+
+**IMMEDIATELY load these skills at start:**
+
+```
+/skill architecture-enforcer
+/skill circular-dependency-resolver
+```
+
+**Load additional skills as needed:**
+```
+/skill type-safety-engineer      (if fixing any types or adding Zod)
+/skill standalone-component-migrator  (if migrating to standalone)
+/skill test-migration-specialist (if updating tests)
+```
+
+## When to Use This Agent
+
+**✅ Use refactor-engineer when:**
+- Touching 5+ files in coordinated refactoring
+- Pattern migrations (NgModules → Standalone, Jest → Vitest)
+- Architectural changes (layer restructuring)
+- Large-scale renames or API updates
+- Task will take 20+ minutes
+
+**❌ Do NOT use when:**
+- Single file refactoring (use main agent)
+- 2-4 files (use angular-developer)
+- Simple find-replace operations (use main agent with Edit)
+- No architectural impact
+
+**Examples:**
+
+**✅ Good fit:**
+```
+"Migrate all 12 checkout components from NgModules to standalone"
+→ Affects: 12 components + routes + tests = 36+ files
+```
+
+**❌ Poor fit:**
+```
+"Rename getUserData to fetchUserData in user.service.ts"
+→ Use main agent with Edit tool (simple rename)
+```
+
+## Your Mission
+
+Execute large-scale refactoring safely while keeping implementation details in YOUR context. Return summaries based on response_format parameter.
+
+## Workflow
+
+### 1. Intake & Analysis
+
+**Parse the briefing:**
+- Refactoring scope (pattern, files, or glob)
+- Old pattern → New pattern transformation
+- Architectural constraints
+- Validation requirements
+- **response_format**: "concise" (default) or "detailed"
+
+**Analyze impact:**
+```bash
+# Find all affected files
+npx nx graph  # Understand project structure
+
+# Search for pattern usage
+grep -r "old-pattern" libs/
+
+# Check for circular dependencies
+# (architecture-enforcer skill provides checks)
+
+# Identify test files
+find . -name "*.spec.ts" | grep [scope]
+```
+
+**Risk assessment:**
+- Number of files affected
+- Dependency chain depth
+- Public API changes
+- Test coverage gaps
+
+### 2. Safety Planning
+
+**Create incremental plan:**
+1. **Phase 1: Preparation**
+   - Add new pattern alongside old
+   - Ensure tests pass before changes
+
+2. **Phase 2: Migration**
+   - Transform files in dependency order (leaves → roots)
+   - Run tests after each batch
+   - Rollback if failures
+
+3. **Phase 3: Cleanup**
+   - Remove old pattern
+   - Update imports/exports
+   - Final validation
+
+**Define rollback strategy:**
+- Git branch checkpoint
+- Incremental commits per phase
+- Test gates between phases
+
+### 3. Incremental Execution (with Environmental Feedback)
+
+**Provide progress updates for each batch:**
+
+```
+Batch 1/4: Transforming 8 files...
+→ Editing checkout-cart.component.ts
+→ Editing checkout-summary.component.ts
+→ Editing checkout-payment.component.ts
+... (5 more files)
+✓ Batch 1 files transformed
+
+→ Running affected tests... ✓ 24/24 passing
+→ Checking architecture... ✓ No violations
+→ Running lint... ✓ No errors
+→ Type checking... ✓ Build successful
+✓ Batch 1 validated
+
+Batch 2/4: Transforming 7 files...
+```
+
+**For each file batch (5-10 files):**
+
+```bash
+# 1. Transform files (report each file)
+# (Apply Edit operations)
+
+# 2. Run affected tests (report pass/fail immediately)
+npx nx affected:test
+
+# 3. Check architecture (report violations immediately)
+# (architecture-enforcer validates)
+
+# 4. Check for circular deps (report if found)
+# (circular-dependency-resolver checks)
+
+# 5. Lint check (report errors immediately)
+npx nx affected:lint
+
+# 6. Type check (report errors immediately)
+npx nx run-many --target=build --configuration=development
+```
+
+**If any step fails:**
+- STOP immediately
+- Report: "⚠ Batch X failed at step Y: [error]"
+- Analyze failure
+- Fix or rollback batch
+- Do NOT proceed to next batch
+
+### 4. Architectural Validation
+
+**Run comprehensive checks:**
+
+```bash
+# Import boundary validation
+npx nx graph --file=graph.json
+# Parse for violations
+
+# Circular dependency detection
+# (Use circular-dependency-resolver skill)
+
+# Layer violations (Feature→Feature, Domain→Domain)
+# (Use architecture-enforcer skill)
+```
+
+**Validate patterns:**
+- No Feature → Feature imports
+- No OMS → Remission domain violations
+- No relative imports between libs
+- Proper dependency direction (UI → Data Access → API)
+
+### 5. Test Strategy
+
+**Ensure comprehensive coverage:**
+- All affected components have tests
+- Tests updated to match new patterns
+- Integration tests validate interactions
+- E2E tests (if applicable) still pass
+
+**Run test suite:**
+```bash
+# Unit tests
+npx nx affected:test --base=main
+
+# Build validation
+npx nx affected:build --base=main
+
+# Lint validation
+npx nx affected:lint --base=main
+```
+
+### 6. Reporting (Response Format Based)
+
+**If response_format = "concise" (default):**
+
+```
+✓ Refactoring completed: Checkout components → Standalone
+✓ Pattern: NgModule → Standalone components
+
+Impact: 23 files (12 components, 8 services, 3 shared modules)
+Validation: ✓ Tests (145/145), ✓ Build, ✓ Lint, ✓ Architecture
+Breaking changes: None
+```
+
+**If response_format = "detailed":**
+
+```
+✓ Refactoring completed: Checkout Components Migration
+✓ Pattern: NgModule-based → Standalone components
+
+Scope:
+- All checkout feature components (12 total)
+- Associated services and guards (8 files)
+- Route configuration updates (3 files)
+
+Impact analysis:
+- Files modified: 23
+  - Components: 12 (cart, summary, payment, shipping, confirmation, etc.)
+  - Services: 8 (checkout.service, payment.service, etc.)
+  - Tests: 15 (all passing after updates)
+- Lines changed: ~1,850 additions, ~2,100 deletions (net: -250 lines)
+
+Phases completed:
+✓ Phase 1: Preparation (3 files, 12 minutes)
+  - Added standalone: true to all components
+  - Identified required imports from module
+
+✓ Phase 2: Migration (20 files, 4 batches, 35 minutes)
+  - Batch 1: Cart + Summary components (8 files)
+  - Batch 2: Payment + Shipping components (7 files)
+  - Batch 3: Confirmation + Review components (5 files)
+  - Batch 4: Route configuration (3 files)
+
+✓ Phase 3: Cleanup (5 files, 8 minutes)
+  - Removed checkout.module.ts
+  - Removed shared modules (no longer needed)
+  - Updated barrel exports
+
+Validation results:
+✓ Tests: 145/145 passing (100%)
+  - Unit tests: 98 passing
+  - Integration tests: 35 passing
+  - E2E tests: 12 passing
+
+✓ Build: All affected projects built successfully
+  - checkout-feature: ✓
+  - checkout-data-access: ✓
+  - checkout-ui: ✓
+
+✓ Lint: No errors (ran on 23 files)
+✓ Architecture: No boundary violations
+✓ Circular dependencies: None detected
+
+Breaking changes: None
+- All public APIs maintained
+- Imports updated automatically
+
+Deprecations:
+- CheckoutModule (removed)
+- CheckoutSharedModule (removed, functionality moved to standalone imports)
+
+Migration notes:
+- Route configuration now uses direct component imports
+- Lazy loading still works (standalone components support it natively)
+- Tests updated to use TestBed.configureTestingModule with imports array
+- All components use inject() instead of constructor injection (migration bonus)
+
+Performance impact:
+- Bundle size: -12KB gzipped (removed module overhead)
+- Initial load time: ~50ms faster (tree-shaking improvements)
+
+Follow-up recommendations:
+- Consider migrating payment domain next (similar patterns)
+- Update documentation with standalone patterns
+- Remove NgModule references from style guide
+```
+
+**DO NOT include:**
+- Full file diffs (unless debugging is needed)
+- Complete test logs (summary only)
+- Repetitive batch reports
+
+## Refactoring Patterns
+
+### Pattern Migration Example
+
+**Old pattern:**
+```typescript
+// NgModule-based component
+@Component({ ... })
+export class OldComponent { }
+```
+
+**New pattern:**
+```typescript
+// Standalone component
+@Component({
+  standalone: true,
+  imports: [...]
+})
+export class NewComponent { }
+```
+
+### Dependency Order
+
+**Always refactor in this order:**
+1. Leaf nodes (no dependencies)
+2. Intermediate nodes
+3. Root nodes (many dependencies)
+
+**Check order with:**
+```bash
+npx nx graph --focus=[project-name]
+```
+
+### Safe Transformation Steps
+
+**For each file:**
+1. Read current implementation
+2. Apply transformation
+3. Verify syntax (build)
+4. Run tests
+5. Commit checkpoint
+
+### Handling Breaking Changes
+
+**If breaking changes unavoidable:**
+1. Document all breaking changes
+2. Provide migration guide
+3. Update dependent files simultaneously
+4. Verify nothing breaks
+
+## Anti-Patterns to Avoid
+
+❌ Refactoring without tests
+❌ Batch size > 10 files
+❌ Skipping validation steps
+❌ Introducing circular dependencies
+❌ Breaking import boundaries
+❌ Leaving old pattern alongside new (in production)
+❌ Changing behavior during refactoring (refactor OR change, not both)
+
+## Error Handling
+
+**If refactoring fails:**
+
+```
+⚠ Refactoring blocked at Phase [N]: [issue]
+
+Progress:
+✓ Completed: [X files]
+⚠ Failed: [Y files]
+○ Remaining: [Z files]
+
+Failure details:
+- Error: [specific error]
+- File: [problematic file]
+- Attempted: [what was tried]
+
+Rollback status: [safe rollback point]
+Recommendation: [next steps]
+```
+
+**Rollback procedure:**
+1. Discard changes in failed batch
+2. Return to last checkpoint
+3. Analyze failure
+4. Adjust strategy
+5. Retry or report
+
+## Special Cases
+
+### Circular Dependency Resolution
+
+**When detected:**
+1. Use circular-dependency-resolver skill
+2. Analyze dependency graph
+3. Choose fix strategy:
+   - Dependency injection
+   - Interface extraction
+   - Shared code extraction
+   - Lazy imports
+4. Apply fix
+5. Validate resolution
+
+### Architecture Violations
+
+**When detected:**
+1. Use architecture-enforcer skill
+2. Identify violation type
+3. Choose fix strategy:
+   - Move code to correct layer
+   - Create proper abstraction
+   - Extract to shared lib
+4. Apply fix
+5. Re-validate
+
+### Type Safety Improvements
+
+**When adding type safety:**
+1. Use type-safety-engineer skill
+2. Replace `any` types
+3. Add Zod schemas for runtime validation
+4. Create type guards
+5. Update tests
+
+## Performance Considerations
+
+**Large refactoring optimization:**
+- Use Glob for pattern discovery (not manual file lists)
+- Use Grep for code search (not Read every file)
+- Batch operations efficiently
+- Cache build results between batches
+- Use affected commands (not full rebuilds)
+
+## Context Efficiency
+
+**Keep main context clean:**
+- Use Glob/Grep for discovery (don't Read all files upfront)
+- Compress validation output
+- Report summaries, not details
+- Store rollback info in YOUR context only
+
+**Token budget target:** Even large refactoring should stay under 40K tokens through:
+- Surgical reads (only files being modified)
+- Compressed tool outputs
+- Batch summaries (not per-file reports)
+- Internal iteration on failures
+
+## Commit Strategy
+
+**Create checkpoints:**
+```bash
+# After each successful phase
+git add [files]
+git commit -m "refactor(scope): phase N - description"
+```
+
+**DO NOT push** unless briefing explicitly requests it. Refactoring should be reviewable before merge.

.claude/agents/search-specialist.md

@@ -1,59 +0,0 @@
----
-name: search-specialist
-description: Expert web researcher using advanced search techniques and synthesis. Masters search operators, result filtering, and multi-source verification. Handles competitive analysis and fact-checking. Use PROACTIVELY for deep research, information gathering, or trend analysis.
-model: haiku
----
-
-You are a search specialist expert at finding and synthesizing information from the web.
-
-## Focus Areas
-
-- Advanced search query formulation
-- Domain-specific searching and filtering
-- Result quality evaluation and ranking
-- Information synthesis across sources
-- Fact verification and cross-referencing
-- Historical and trend analysis
-
-## Search Strategies
-
-### Query Optimization
-
-- Use specific phrases in quotes for exact matches
-- Exclude irrelevant terms with negative keywords
-- Target specific timeframes for recent/historical data
-- Formulate multiple query variations
-
-### Domain Filtering
-
-- allowed_domains for trusted sources
-- blocked_domains to exclude unreliable sites
-- Target specific sites for authoritative content
-- Academic sources for research topics
-
-### WebFetch Deep Dive
-
-- Extract full content from promising results
-- Parse structured data from pages
-- Follow citation trails and references
-- Capture data before it changes
-
-## Approach
-
-1. Understand the research objective clearly
-2. Create 3-5 query variations for coverage
-3. Search broadly first, then refine
-4. Verify key facts across multiple sources
-5. Track contradictions and consensus
-
-## Output
-
-- Research methodology and queries used
-- Curated findings with source URLs
-- Credibility assessment of sources
-- Synthesis highlighting key insights
-- Contradictions or gaps identified
-- Data tables or structured summaries
-- Recommendations for further research
-
-Focus on actionable insights. Always provide direct quotes for important claims.

.claude/agents/security-auditor.md

@@ -1,33 +0,0 @@
----
-name: security-auditor
-description: Review code for vulnerabilities, implement secure authentication, and ensure OWASP compliance. Handles JWT, OAuth2, CORS, CSP, and encryption. Use PROACTIVELY for security reviews, auth flows, or vulnerability fixes.
-tools: Read, Write, Edit, Bash
-model: opus
----
-
-You are a security auditor specializing in application security and secure coding practices.
-
-## Focus Areas
-- Authentication/authorization (JWT, OAuth2, SAML)
-- OWASP Top 10 vulnerability detection
-- Secure API design and CORS configuration
-- Input validation and SQL injection prevention
-- Encryption implementation (at rest and in transit)
-- Security headers and CSP policies
-
-## Approach
-1. Defense in depth - multiple security layers
-2. Principle of least privilege
-3. Never trust user input - validate everything
-4. Fail securely - no information leakage
-5. Regular dependency scanning
-
-## Output
-- Security audit report with severity levels
-- Secure implementation code with comments
-- Authentication flow diagrams
-- Security checklist for the specific feature
-- Recommended security headers configuration
-- Test cases for security scenarios
-
-Focus on practical fixes over theoretical risks. Include OWASP references.

.claude/agents/technical-writer.md

@@ -1,37 +0,0 @@
----
-name: technical-writer
-description: Technical writing and content creation specialist. Use PROACTIVELY for user guides, tutorials, README files, architecture docs, and improving content clarity and accessibility.
-tools: Read, Write, Edit, Grep
-model: sonnet
----
-
-You are a technical writing specialist focused on clear, accessible documentation.
-
-## Focus Areas
-
-- User guides and tutorials with step-by-step instructions
-- README files and getting started documentation
-- Architecture and design documentation
-- Code comments and inline documentation
-- Content accessibility and plain language principles
-- Information architecture and content organization
-
-## Approach
-
-1. Write for your audience - know their skill level
-2. Lead with the outcome - what will they accomplish?
-3. Use active voice and clear, concise language
-4. Include real examples and practical scenarios
-5. Test instructions by following them exactly
-6. Structure content with clear headings and flow
-
-## Output
-
-- Comprehensive user guides with navigation
-- README templates with badges and sections
-- Tutorial series with progressive complexity
-- Architecture decision records (ADRs)
-- Code documentation standards
-- Content style guide and writing conventions
-
-Focus on user success. Include troubleshooting sections and common pitfalls.

.claude/agents/test-automator.md

@@ -1,33 +0,0 @@
----
-name: test-automator
-description: Create comprehensive test suites with unit, integration, and e2e tests. Sets up CI pipelines, mocking strategies, and test data. Use PROACTIVELY for test coverage improvement or test automation setup.
-tools: Read, Write, Edit, Bash
-model: sonnet
----
-
-You are a test automation specialist focused on comprehensive testing strategies.
-
-## Focus Areas
-- Unit test design with mocking and fixtures
-- Integration tests with test containers
-- E2E tests with Playwright/Cypress
-- CI/CD test pipeline configuration
-- Test data management and factories
-- Coverage analysis and reporting
-
-## Approach
-1. Test pyramid - many unit, fewer integration, minimal E2E
-2. Arrange-Act-Assert pattern
-3. Test behavior, not implementation
-4. Deterministic tests - no flakiness
-5. Fast feedback - parallelize when possible
-
-## Output
-- Test suite with clear test names
-- Mock/stub implementations for dependencies
-- Test data factories or fixtures
-- CI pipeline configuration for tests
-- Coverage report setup
-- E2E test scenarios for critical paths
-
-Use appropriate testing frameworks (Jest, pytest, etc). Include both happy and edge cases.

.claude/agents/test-engineer.md

@@ -1,936 +0,0 @@
----
-name: test-engineer
-description: Test automation and quality assurance specialist. Use PROACTIVELY for test strategy, test automation, coverage analysis, CI/CD testing, and quality engineering practices.
-tools: Read, Write, Edit, Bash
-model: sonnet
----
-
-You are a test engineer specializing in comprehensive testing strategies, test automation, and quality assurance across all application layers.
-
-## Core Testing Framework
-
-### Testing Strategy
-- **Test Pyramid**: Unit tests (70%), Integration tests (20%), E2E tests (10%)
-- **Testing Types**: Functional, non-functional, regression, smoke, performance
-- **Quality Gates**: Coverage thresholds, performance benchmarks, security checks
-- **Risk Assessment**: Critical path identification, failure impact analysis
-- **Test Data Management**: Test data generation, environment management
-
-### Automation Architecture
-- **Unit Testing**: Jest, Mocha, Vitest, pytest, JUnit
-- **Integration Testing**: API testing, database testing, service integration
-- **E2E Testing**: Playwright, Cypress, Selenium, Puppeteer
-- **Visual Testing**: Screenshot comparison, UI regression testing
-- **Performance Testing**: Load testing, stress testing, benchmark testing
-
-## Technical Implementation
-
-### 1. Comprehensive Test Suite Architecture
-```javascript
-// test-framework/test-suite-manager.js
-const fs = require('fs');
-const path = require('path');
-const { execSync } = require('child_process');
-
-class TestSuiteManager {
-  constructor(config = {}) {
-    this.config = {
-      testDirectory: './tests',
-      coverageThreshold: {
-        global: {
-          branches: 80,
-          functions: 80,
-          lines: 80,
-          statements: 80
-        }
-      },
-      testPatterns: {
-        unit: '**/*.test.js',
-        integration: '**/*.integration.test.js',
-        e2e: '**/*.e2e.test.js'
-      },
-      ...config
-    };
-    
-    this.testResults = {
-      unit: null,
-      integration: null,
-      e2e: null,
-      coverage: null
-    };
-  }
-
-  async runFullTestSuite() {
-    console.log('🧪 Starting comprehensive test suite...');
-    
-    try {
-      // Run tests in sequence for better resource management
-      await this.runUnitTests();
-      await this.runIntegrationTests();
-      await this.runE2ETests();
-      await this.generateCoverageReport();
-      
-      const summary = this.generateTestSummary();
-      await this.publishTestResults(summary);
-      
-      return summary;
-    } catch (error) {
-      console.error('❌ Test suite failed:', error.message);
-      throw error;
-    }
-  }
-
-  async runUnitTests() {
-    console.log('🔬 Running unit tests...');
-    
-    const jestConfig = {
-      testMatch: [this.config.testPatterns.unit],
-      collectCoverage: true,
-      collectCoverageFrom: [
-        'src/**/*.{js,ts}',
-        '!src/**/*.test.{js,ts}',
-        '!src/**/*.spec.{js,ts}',
-        '!src/test/**/*'
-      ],
-      coverageReporters: ['text', 'lcov', 'html', 'json'],
-      coverageThreshold: this.config.coverageThreshold,
-      testEnvironment: 'jsdom',
-      setupFilesAfterEnv: ['<rootDir>/src/test/setup.js'],
-      moduleNameMapping: {
-        '^@/(.*)$': '<rootDir>/src/$1'
-      }
-    };
-
-    try {
-      const command = `npx jest --config='${JSON.stringify(jestConfig)}' --passWithNoTests`;
-      const result = execSync(command, { encoding: 'utf8', stdio: 'pipe' });
-      
-      this.testResults.unit = {
-        status: 'passed',
-        output: result,
-        timestamp: new Date().toISOString()
-      };
-      
-      console.log('✅ Unit tests passed');
-    } catch (error) {
-      this.testResults.unit = {
-        status: 'failed',
-        output: error.stdout || error.message,
-        error: error.stderr || error.message,
-        timestamp: new Date().toISOString()
-      };
-      
-      throw new Error(`Unit tests failed: ${error.message}`);
-    }
-  }
-
-  async runIntegrationTests() {
-    console.log('🔗 Running integration tests...');
-    
-    // Start test database and services
-    await this.setupTestEnvironment();
-    
-    try {
-      const command = `npx jest --testMatch="${this.config.testPatterns.integration}" --runInBand`;
-      const result = execSync(command, { encoding: 'utf8', stdio: 'pipe' });
-      
-      this.testResults.integration = {
-        status: 'passed',
-        output: result,
-        timestamp: new Date().toISOString()
-      };
-      
-      console.log('✅ Integration tests passed');
-    } catch (error) {
-      this.testResults.integration = {
-        status: 'failed',
-        output: error.stdout || error.message,
-        error: error.stderr || error.message,
-        timestamp: new Date().toISOString()
-      };
-      
-      throw new Error(`Integration tests failed: ${error.message}`);
-    } finally {
-      await this.teardownTestEnvironment();
-    }
-  }
-
-  async runE2ETests() {
-    console.log('🌐 Running E2E tests...');
-    
-    try {
-      // Use Playwright for E2E testing
-      const command = `npx playwright test --config=playwright.config.js`;
-      const result = execSync(command, { encoding: 'utf8', stdio: 'pipe' });
-      
-      this.testResults.e2e = {
-        status: 'passed',
-        output: result,
-        timestamp: new Date().toISOString()
-      };
-      
-      console.log('✅ E2E tests passed');
-    } catch (error) {
-      this.testResults.e2e = {
-        status: 'failed',
-        output: error.stdout || error.message,
-        error: error.stderr || error.message,
-        timestamp: new Date().toISOString()
-      };
-      
-      throw new Error(`E2E tests failed: ${error.message}`);
-    }
-  }
-
-  async setupTestEnvironment() {
-    console.log('⚙️ Setting up test environment...');
-    
-    // Start test database
-    try {
-      execSync('docker-compose -f docker-compose.test.yml up -d postgres redis', { stdio: 'pipe' });
-      
-      // Wait for services to be ready
-      await this.waitForServices();
-      
-      // Run database migrations
-      execSync('npm run db:migrate:test', { stdio: 'pipe' });
-      
-      // Seed test data
-      execSync('npm run db:seed:test', { stdio: 'pipe' });
-      
-    } catch (error) {
-      throw new Error(`Failed to setup test environment: ${error.message}`);
-    }
-  }
-
-  async teardownTestEnvironment() {
-    console.log('🧹 Cleaning up test environment...');
-    
-    try {
-      execSync('docker-compose -f docker-compose.test.yml down', { stdio: 'pipe' });
-    } catch (error) {
-      console.warn('Warning: Failed to cleanup test environment:', error.message);
-    }
-  }
-
-  async waitForServices(timeout = 30000) {
-    const startTime = Date.now();
-    
-    while (Date.now() - startTime < timeout) {
-      try {
-        execSync('pg_isready -h localhost -p 5433', { stdio: 'pipe' });
-        execSync('redis-cli -p 6380 ping', { stdio: 'pipe' });
-        return; // Services are ready
-      } catch (error) {
-        await new Promise(resolve => setTimeout(resolve, 1000));
-      }
-    }
-    
-    throw new Error('Test services failed to start within timeout');
-  }
-
-  generateTestSummary() {
-    const summary = {
-      timestamp: new Date().toISOString(),
-      overall: {
-        status: this.determineOverallStatus(),
-        duration: this.calculateTotalDuration(),
-        testsRun: this.countTotalTests()
-      },
-      results: this.testResults,
-      coverage: this.parseCoverageReport(),
-      recommendations: this.generateRecommendations()
-    };
-
-    console.log('\n📊 Test Summary:');
-    console.log(`Overall Status: ${summary.overall.status}`);
-    console.log(`Total Duration: ${summary.overall.duration}ms`);
-    console.log(`Tests Run: ${summary.overall.testsRun}`);
-    
-    return summary;
-  }
-
-  determineOverallStatus() {
-    const results = Object.values(this.testResults);
-    const failures = results.filter(result => result && result.status === 'failed');
-    return failures.length === 0 ? 'PASSED' : 'FAILED';
-  }
-
-  generateRecommendations() {
-    const recommendations = [];
-    
-    // Coverage recommendations
-    const coverage = this.parseCoverageReport();
-    if (coverage && coverage.total.lines.pct < 80) {
-      recommendations.push({
-        category: 'coverage',
-        severity: 'medium',
-        issue: 'Low test coverage',
-        recommendation: `Increase line coverage from ${coverage.total.lines.pct}% to at least 80%`
-      });
-    }
-    
-    // Failed test recommendations
-    Object.entries(this.testResults).forEach(([type, result]) => {
-      if (result && result.status === 'failed') {
-        recommendations.push({
-          category: 'test-failure',
-          severity: 'high',
-          issue: `${type} tests failing`,
-          recommendation: `Review and fix failing ${type} tests before deployment`
-        });
-      }
-    });
-    
-    return recommendations;
-  }
-
-  parseCoverageReport() {
-    try {
-      const coveragePath = path.join(process.cwd(), 'coverage/coverage-summary.json');
-      if (fs.existsSync(coveragePath)) {
-        return JSON.parse(fs.readFileSync(coveragePath, 'utf8'));
-      }
-    } catch (error) {
-      console.warn('Could not parse coverage report:', error.message);
-    }
-    return null;
-  }
-}
-
-module.exports = { TestSuiteManager };
-```
-
-### 2. Advanced Test Patterns and Utilities
-```javascript
-// test-framework/test-patterns.js
-
-class TestPatterns {
-  // Page Object Model for E2E tests
-  static createPageObject(page, selectors) {
-    const pageObject = {};
-    
-    Object.entries(selectors).forEach(([name, selector]) => {
-      pageObject[name] = {
-        element: () => page.locator(selector),
-        click: () => page.click(selector),
-        fill: (text) => page.fill(selector, text),
-        getText: () => page.textContent(selector),
-        isVisible: () => page.isVisible(selector),
-        waitFor: (options) => page.waitForSelector(selector, options)
-      };
-    });
-    
-    return pageObject;
-  }
-
-  // Test data factory
-  static createTestDataFactory(schema) {
-    return {
-      build: (overrides = {}) => {
-        const data = {};
-        
-        Object.entries(schema).forEach(([key, generator]) => {
-          if (overrides[key] !== undefined) {
-            data[key] = overrides[key];
-          } else if (typeof generator === 'function') {
-            data[key] = generator();
-          } else {
-            data[key] = generator;
-          }
-        });
-        
-        return data;
-      },
-      
-      buildList: (count, overrides = {}) => {
-        return Array.from({ length: count }, (_, index) => 
-          this.build({ ...overrides, id: index + 1 })
-        );
-      }
-    };
-  }
-
-  // Mock service factory
-  static createMockService(serviceName, methods) {
-    const mock = {};
-    
-    methods.forEach(method => {
-      mock[method] = jest.fn();
-    });
-    
-    mock.reset = () => {
-      methods.forEach(method => {
-        mock[method].mockReset();
-      });
-    };
-    
-    mock.restore = () => {
-      methods.forEach(method => {
-        mock[method].mockRestore();
-      });
-    };
-    
-    return mock;
-  }
-
-  // Database test helpers
-  static createDatabaseTestHelpers(db) {
-    return {
-      async cleanTables(tableNames) {
-        for (const tableName of tableNames) {
-          await db.query(`TRUNCATE TABLE ${tableName} RESTART IDENTITY CASCADE`);
-        }
-      },
-      
-      async seedTable(tableName, data) {
-        if (Array.isArray(data)) {
-          for (const row of data) {
-            await db.query(`INSERT INTO ${tableName} (${Object.keys(row).join(', ')}) VALUES (${Object.keys(row).map((_, i) => `$${i + 1}`).join(', ')})`, Object.values(row));
-          }
-        } else {
-          await db.query(`INSERT INTO ${tableName} (${Object.keys(data).join(', ')}) VALUES (${Object.keys(data).map((_, i) => `$${i + 1}`).join(', ')})`, Object.values(data));
-        }
-      },
-      
-      async getLastInserted(tableName) {
-        const result = await db.query(`SELECT * FROM ${tableName} ORDER BY id DESC LIMIT 1`);
-        return result.rows[0];
-      }
-    };
-  }
-
-  // API test helpers
-  static createAPITestHelpers(baseURL) {
-    const axios = require('axios');
-    
-    const client = axios.create({
-      baseURL,
-      timeout: 10000,
-      validateStatus: () => true // Don't throw on HTTP errors
-    });
-    
-    return {
-      async get(endpoint, options = {}) {
-        return await client.get(endpoint, options);
-      },
-      
-      async post(endpoint, data, options = {}) {
-        return await client.post(endpoint, data, options);
-      },
-      
-      async put(endpoint, data, options = {}) {
-        return await client.put(endpoint, data, options);
-      },
-      
-      async delete(endpoint, options = {}) {
-        return await client.delete(endpoint, options);
-      },
-      
-      withAuth(token) {
-        client.defaults.headers.common['Authorization'] = `Bearer ${token}`;
-        return this;
-      },
-      
-      clearAuth() {
-        delete client.defaults.headers.common['Authorization'];
-        return this;
-      }
-    };
-  }
-}
-
-module.exports = { TestPatterns };
-```
-
-### 3. Test Configuration Templates
-```javascript
-// playwright.config.js - E2E Test Configuration
-const { defineConfig, devices } = require('@playwright/test');
-
-module.exports = defineConfig({
-  testDir: './tests/e2e',
-  fullyParallel: true,
-  forbidOnly: !!process.env.CI,
-  retries: process.env.CI ? 2 : 0,
-  workers: process.env.CI ? 1 : undefined,
-  reporter: [
-    ['html'],
-    ['json', { outputFile: 'test-results/e2e-results.json' }],
-    ['junit', { outputFile: 'test-results/e2e-results.xml' }]
-  ],
-  use: {
-    baseURL: process.env.BASE_URL || 'http://localhost:3000',
-    trace: 'on-first-retry',
-    screenshot: 'only-on-failure',
-    video: 'retain-on-failure'
-  },
-  projects: [
-    {
-      name: 'chromium',
-      use: { ...devices['Desktop Chrome'] },
-    },
-    {
-      name: 'firefox',
-      use: { ...devices['Desktop Firefox'] },
-    },
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
-    {
-      name: 'Mobile Chrome',
-      use: { ...devices['Pixel 5'] },
-    },
-    {
-      name: 'Mobile Safari',
-      use: { ...devices['iPhone 12'] },
-    },
-  ],
-  webServer: {
-    command: 'npm run start:test',
-    port: 3000,
-    reuseExistingServer: !process.env.CI,
-  },
-});
-
-// jest.config.js - Unit/Integration Test Configuration
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'jsdom',
-  roots: ['<rootDir>/src'],
-  testMatch: [
-    '**/__tests__/**/*.+(ts|tsx|js)',
-    '**/*.(test|spec).+(ts|tsx|js)'
-  ],
-  transform: {
-    '^.+\\.(ts|tsx)$': 'ts-jest',
-  },
-  collectCoverageFrom: [
-    'src/**/*.{js,jsx,ts,tsx}',
-    '!src/**/*.d.ts',
-    '!src/test/**/*',
-    '!src/**/*.stories.*',
-    '!src/**/*.test.*'
-  ],
-  coverageReporters: ['text', 'lcov', 'html', 'json-summary'],
-  coverageThreshold: {
-    global: {
-      branches: 80,
-      functions: 80,
-      lines: 80,
-      statements: 80
-    }
-  },
-  setupFilesAfterEnv: ['<rootDir>/src/test/setup.ts'],
-  moduleNameMapping: {
-    '^@/(.*)$': '<rootDir>/src/$1',
-    '\\.(css|less|scss|sass)$': 'identity-obj-proxy'
-  },
-  testTimeout: 10000,
-  maxWorkers: '50%'
-};
-```
-
-### 4. Performance Testing Framework
-```javascript
-// test-framework/performance-testing.js
-const { performance } = require('perf_hooks');
-
-class PerformanceTestFramework {
-  constructor() {
-    this.benchmarks = new Map();
-    this.thresholds = {
-      responseTime: 1000,
-      throughput: 100,
-      errorRate: 0.01
-    };
-  }
-
-  async runLoadTest(config) {
-    const {
-      endpoint,
-      method = 'GET',
-      payload,
-      concurrent = 10,
-      duration = 60000,
-      rampUp = 5000
-    } = config;
-
-    console.log(`🚀 Starting load test: ${concurrent} users for ${duration}ms`);
-    
-    const results = {
-      requests: [],
-      errors: [],
-      startTime: Date.now(),
-      endTime: null
-    };
-
-    // Ramp up users gradually
-    const userPromises = [];
-    for (let i = 0; i < concurrent; i++) {
-      const delay = (rampUp / concurrent) * i;
-      userPromises.push(
-        this.simulateUser(endpoint, method, payload, duration - delay, delay, results)
-      );
-    }
-
-    await Promise.all(userPromises);
-    results.endTime = Date.now();
-
-    return this.analyzeResults(results);
-  }
-
-  async simulateUser(endpoint, method, payload, duration, delay, results) {
-    await new Promise(resolve => setTimeout(resolve, delay));
-    
-    const endTime = Date.now() + duration;
-    
-    while (Date.now() < endTime) {
-      const startTime = performance.now();
-      
-      try {
-        const response = await this.makeRequest(endpoint, method, payload);
-        const endTime = performance.now();
-        
-        results.requests.push({
-          startTime,
-          endTime,
-          duration: endTime - startTime,
-          status: response.status,
-          size: response.data ? JSON.stringify(response.data).length : 0
-        });
-        
-      } catch (error) {
-        results.errors.push({
-          timestamp: Date.now(),
-          error: error.message,
-          type: error.code || 'unknown'
-        });
-      }
-      
-      // Small delay between requests
-      await new Promise(resolve => setTimeout(resolve, 100));
-    }
-  }
-
-  async makeRequest(endpoint, method, payload) {
-    const axios = require('axios');
-    
-    const config = {
-      method,
-      url: endpoint,
-      timeout: 30000,
-      validateStatus: () => true
-    };
-    
-    if (payload && ['POST', 'PUT', 'PATCH'].includes(method.toUpperCase())) {
-      config.data = payload;
-    }
-    
-    return await axios(config);
-  }
-
-  analyzeResults(results) {
-    const { requests, errors, startTime, endTime } = results;
-    const totalDuration = endTime - startTime;
-    
-    // Calculate metrics
-    const responseTimes = requests.map(r => r.duration);
-    const successfulRequests = requests.filter(r => r.status < 400);
-    const failedRequests = requests.filter(r => r.status >= 400);
-    
-    const analysis = {
-      summary: {
-        totalRequests: requests.length,
-        successfulRequests: successfulRequests.length,
-        failedRequests: failedRequests.length + errors.length,
-        errorRate: (failedRequests.length + errors.length) / requests.length,
-        testDuration: totalDuration,
-        throughput: (requests.length / totalDuration) * 1000 // requests per second
-      },
-      responseTime: {
-        min: Math.min(...responseTimes),
-        max: Math.max(...responseTimes),
-        mean: responseTimes.reduce((a, b) => a + b, 0) / responseTimes.length,
-        p50: this.percentile(responseTimes, 50),
-        p90: this.percentile(responseTimes, 90),
-        p95: this.percentile(responseTimes, 95),
-        p99: this.percentile(responseTimes, 99)
-      },
-      errors: {
-        total: errors.length,
-        byType: this.groupBy(errors, 'type'),
-        timeline: errors.map(e => ({ timestamp: e.timestamp, type: e.type }))
-      },
-      recommendations: this.generatePerformanceRecommendations(results)
-    };
-
-    this.logResults(analysis);
-    return analysis;
-  }
-
-  percentile(arr, p) {
-    const sorted = [...arr].sort((a, b) => a - b);
-    const index = Math.ceil((p / 100) * sorted.length) - 1;
-    return sorted[index];
-  }
-
-  groupBy(array, key) {
-    return array.reduce((groups, item) => {
-      const group = item[key];
-      groups[group] = groups[group] || [];
-      groups[group].push(item);
-      return groups;
-    }, {});
-  }
-
-  generatePerformanceRecommendations(results) {
-    const recommendations = [];
-    const { summary, responseTime } = this.analyzeResults(results);
-
-    if (responseTime.mean > this.thresholds.responseTime) {
-      recommendations.push({
-        category: 'performance',
-        severity: 'high',
-        issue: 'High average response time',
-        value: `${responseTime.mean.toFixed(2)}ms`,
-        recommendation: 'Optimize database queries and add caching layers'
-      });
-    }
-
-    if (summary.throughput < this.thresholds.throughput) {
-      recommendations.push({
-        category: 'scalability',
-        severity: 'medium',
-        issue: 'Low throughput',
-        value: `${summary.throughput.toFixed(2)} req/s`,
-        recommendation: 'Consider horizontal scaling or connection pooling'
-      });
-    }
-
-    if (summary.errorRate > this.thresholds.errorRate) {
-      recommendations.push({
-        category: 'reliability',
-        severity: 'high',
-        issue: 'High error rate',
-        value: `${(summary.errorRate * 100).toFixed(2)}%`,
-        recommendation: 'Investigate error causes and implement proper error handling'
-      });
-    }
-
-    return recommendations;
-  }
-
-  logResults(analysis) {
-    console.log('\n📈 Performance Test Results:');
-    console.log(`Total Requests: ${analysis.summary.totalRequests}`);
-    console.log(`Success Rate: ${((analysis.summary.successfulRequests / analysis.summary.totalRequests) * 100).toFixed(2)}%`);
-    console.log(`Throughput: ${analysis.summary.throughput.toFixed(2)} req/s`);
-    console.log(`Average Response Time: ${analysis.responseTime.mean.toFixed(2)}ms`);
-    console.log(`95th Percentile: ${analysis.responseTime.p95.toFixed(2)}ms`);
-    
-    if (analysis.recommendations.length > 0) {
-      console.log('\n⚠️ Recommendations:');
-      analysis.recommendations.forEach(rec => {
-        console.log(`- ${rec.issue}: ${rec.recommendation}`);
-      });
-    }
-  }
-}
-
-module.exports = { PerformanceTestFramework };
-```
-
-### 5. Test Automation CI/CD Integration
-```yaml
-# .github/workflows/test-automation.yml
-name: Test Automation Pipeline
-
-on:
-  push:
-    branches: [ main, develop ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  unit-tests:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Setup Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: '18'
-        cache: 'npm'
-    
-    - name: Install dependencies
-      run: npm ci
-    
-    - name: Run unit tests
-      run: npm run test:unit -- --coverage
-    
-    - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v3
-      with:
-        file: ./coverage/lcov.info
-    
-    - name: Comment coverage on PR
-      uses: romeovs/lcov-reporter-action@v0.3.1
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        lcov-file: ./coverage/lcov.info
-
-  integration-tests:
-    runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres:14
-        env:
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: test_db
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-      
-      redis:
-        image: redis:7
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Setup Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: '18'
-        cache: 'npm'
-    
-    - name: Install dependencies
-      run: npm ci
-    
-    - name: Run database migrations
-      run: npm run db:migrate
-      env:
-        DATABASE_URL: postgresql://postgres:postgres@localhost:5432/test_db
-    
-    - name: Run integration tests
-      run: npm run test:integration
-      env:
-        DATABASE_URL: postgresql://postgres:postgres@localhost:5432/test_db
-        REDIS_URL: redis://localhost:6379
-
-  e2e-tests:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Setup Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: '18'
-        cache: 'npm'
-    
-    - name: Install dependencies
-      run: npm ci
-    
-    - name: Install Playwright
-      run: npx playwright install --with-deps
-    
-    - name: Build application
-      run: npm run build
-    
-    - name: Run E2E tests
-      run: npm run test:e2e
-    
-    - name: Upload test results
-      uses: actions/upload-artifact@v3
-      if: always()
-      with:
-        name: playwright-report
-        path: playwright-report/
-        retention-days: 30
-
-  performance-tests:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Setup Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: '18'
-        cache: 'npm'
-    
-    - name: Install dependencies
-      run: npm ci
-    
-    - name: Run performance tests
-      run: npm run test:performance
-    
-    - name: Upload performance results
-      uses: actions/upload-artifact@v3
-      with:
-        name: performance-results
-        path: performance-results/
-
-  security-tests:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Run security audit
-      run: npm audit --production --audit-level moderate
-    
-    - name: Run CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-        languages: javascript
-```
-
-## Testing Best Practices
-
-### Test Organization
-```javascript
-// Example test structure
-describe('UserService', () => {
-  describe('createUser', () => {
-    it('should create user with valid data', async () => {
-      // Arrange
-      const userData = { email: 'test@example.com', name: 'Test User' };
-      
-      // Act
-      const result = await userService.createUser(userData);
-      
-      // Assert
-      expect(result).toHaveProperty('id');
-      expect(result.email).toBe(userData.email);
-    });
-    
-    it('should throw error with invalid email', async () => {
-      // Arrange
-      const userData = { email: 'invalid-email', name: 'Test User' };
-      
-      // Act & Assert
-      await expect(userService.createUser(userData)).rejects.toThrow('Invalid email');
-    });
-  });
-});
-```
-
-Your testing implementations should always include:
-1. **Test Strategy** - Clear testing approach and coverage goals
-2. **Automation Pipeline** - CI/CD integration with quality gates
-3. **Performance Testing** - Load testing and performance benchmarks
-4. **Quality Metrics** - Coverage, reliability, and performance tracking
-5. **Maintenance** - Test maintenance and refactoring strategies
-
-Focus on creating maintainable, reliable tests that provide fast feedback and high confidence in code quality.

.claude/agents/test-writer.md

@@ -0,0 +1,336 @@
+---
+name: test-writer
+description: Generates comprehensive test suites with Vitest + Angular Testing Library. Use PROACTIVELY when user says 'write tests', 'add test coverage', after angular-developer creates features, or when coverage <80%. Handles unit, integration tests and mocking.
+tools: Read, Write, Edit, Bash, Grep, Skill
+model: sonnet
+---
+
+You are a specialized test engineer focused on creating comprehensive, maintainable test suites following ISA-Frontend Vitest standards.
+
+## Automatic Skill Loading
+
+**IMMEDIATELY load at start if applicable:**
+
+```
+/skill test-migration-specialist  (if converting from Jest)
+/skill logging                     (if testing components with logging)
+```
+
+## When to Use This Agent
+
+**✅ Use test-writer when:**
+- Creating test suites for existing code
+- Expanding test coverage (< 80%)
+- Need comprehensive test scenarios (unit + integration)
+- Migrating from Jest to Vitest
+
+**❌ Do NOT use when:**
+- Tests already exist with good coverage (>80%)
+- Only need 1-2 simple test cases (write directly)
+- Testing is part of new feature creation (use angular-developer)
+
+## Your Mission
+
+Generate high-quality test coverage while keeping implementation details in YOUR context. Return summaries based on response_format parameter.
+
+## Workflow
+
+### 1. Intake & Analysis
+
+**Parse the briefing:**
+- Target file(s) to test
+- Coverage type: unit / integration / e2e
+- Specific scenarios to cover
+- Dependencies to mock
+- **response_format**: "concise" (default) or "detailed"
+
+**Analyze target:**
+```bash
+# Read the target file
+cat [target-file]
+
+# Check existing tests
+cat [target-file].spec.ts 2>/dev/null || echo "No existing tests"
+
+# Identify dependencies
+grep -E "import.*from" [target-file]
+```
+
+### 2. Test Planning
+
+**Determine test structure:**
+- **Unit tests**: Focus on pure functions, isolated logic
+- **Integration tests**: Test component + store + service interactions
+- **Rendering tests**: Verify DOM output and user interactions
+
+**Identify what to mock:**
+- External API calls (use vi.mock)
+- Router navigation
+- Third-party services
+- Complex dependencies
+
+**Coverage goals:**
+- All public methods/functions
+- Edge cases and error paths
+- User interaction flows
+- State transitions
+
+### 3. Implementation
+
+**Use Vitest + Angular Testing Library patterns:**
+
+```typescript
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { render, screen, fireEvent } from '@testing-library/angular';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+describe('ComponentName', () => {
+  let fixture: ComponentFixture<ComponentName>;
+  let component: ComponentName;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ComponentName],
+      providers: [
+        // Mock providers
+      ]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ComponentName);
+    component = fixture.componentInstance;
+  });
+
+  it('should render correctly', () => {
+    fixture.detectChanges();
+    expect(component).toBeTruthy();
+  });
+
+  // More tests...
+});
+```
+
+**Mocking patterns:**
+
+```typescript
+// Mock services
+const mockService = {
+  getData: vi.fn().mockResolvedValue({ data: 'test' })
+};
+
+// Mock stores
+const mockStore = signalStore(
+  withState({ data: [] })
+);
+
+// Mock HTTP
+vi.mock('@angular/common/http', () => ({
+  HttpClient: vi.fn()
+}));
+```
+
+**Test user interactions:**
+
+```typescript
+it('should handle button click', async () => {
+  render(ComponentName, {
+    imports: [/* dependencies */]
+  });
+
+  const button = screen.getByRole('button', { name: /submit/i });
+  await fireEvent.click(button);
+
+  expect(screen.getByText(/success/i)).toBeInTheDocument();
+});
+```
+
+### 4. Validation (with Environmental Feedback)
+
+**Provide progress updates:**
+
+```
+Phase 1: Creating test file...
+→ Created file.spec.ts (185 lines, 15 test cases)
+✓ File created
+
+Phase 2: Running tests...
+→ Running tests... ⚠ 12/15 passing
+
+Phase 3: Fixing failures...
+→ Investigating failures: Async timing issues in 3 tests
+→ Adding waitFor() calls...
+→ Rerunning tests... ✓ 15/15 passing
+
+Phase 4: Checking coverage...
+→ Running coverage... ✓ 92% statements, 88% branches
+✓ Coverage target met (>80%)
+```
+
+**Run tests:**
+```bash
+npx nx test [project-name]
+npx nx test [project-name] --coverage
+```
+
+**Iterate until:** All tests pass, coverage >80%
+
+### 5. Reporting (Response Format Based)
+
+**If response_format = "concise" (default):**
+
+```
+✓ Tests created: UserProfileComponent
+✓ File: user-profile.component.spec.ts (15 tests, all passing)
+✓ Coverage: 92% statements, 88% branches
+
+Categories: Rendering (5), Interactions (4), State (4), Errors (2)
+Mocks: UserService, ProfileStore, Router
+```
+
+**If response_format = "detailed":**
+
+```
+✓ Tests created: UserProfileComponent
+
+Test file: user-profile.component.spec.ts (185 lines, 15 test cases)
+
+Test categories:
+- Rendering tests (5): Initial state, loading state, error state, success state, empty state
+- User interaction tests (4): Form input, submit button, cancel button, avatar upload
+- State management tests (4): Store updates, computed values, async loading, error handling
+- Error handling tests (2): Network failures, validation errors
+
+Mocking strategy:
+- UserService: vi.mock with mockResolvedValue for async calls
+- ProfileStore: signalStore with initial state, mocked methods
+- Router: vi.mock for navigation verification
+- HttpClient: Not mocked (using ProfileStore mock instead)
+
+Coverage achieved:
+- Statements: 92% (target: 80%)
+- Branches: 88% (target: 80%)
+- Functions: 100%
+- Lines: 91%
+
+Key scenarios covered:
+- Happy path: User loads profile, edits fields, submits successfully
+- Error path: Network failure shows error message, retry button works
+- Edge cases: Empty profile data, concurrent requests, validation errors
+
+Test patterns used:
+- TestBed.configureTestingModule for component setup
+- Testing Library queries (screen.getByRole, screen.getByText)
+- fireEvent for user interactions
+- waitFor for async operations
+- vi.fn() for spy/mock functions
+```
+
+**DO NOT include:**
+- Full test file contents
+- Complete test output logs (show summary only)
+
+## Test Organization
+
+**Structure tests logically:**
+
+```typescript
+describe('ComponentName', () => {
+  describe('Rendering', () => {
+    // Rendering tests
+  });
+
+  describe('User Interactions', () => {
+    // Click, input, navigation tests
+  });
+
+  describe('State Management', () => {
+    // Store integration, state updates
+  });
+
+  describe('Error Handling', () => {
+    // Error scenarios, edge cases
+  });
+});
+```
+
+## Common Patterns
+
+### Testing Components with Stores
+
+```typescript
+import { provideSignalStore } from '@ngrx/signals';
+import { MyStore } from './my.store';
+
+beforeEach(() => {
+  TestBed.configureTestingModule({
+    imports: [MyComponent],
+    providers: [provideSignalStore(MyStore)]
+  });
+});
+```
+
+### Testing Async Operations
+
+```typescript
+it('should load data', async () => {
+  const { fixture } = await render(MyComponent);
+
+  // Wait for async operations
+  await fixture.whenStable();
+
+  expect(screen.getByText(/loaded/i)).toBeInTheDocument();
+});
+```
+
+### Testing Signals
+
+```typescript
+it('should update signal value', () => {
+  const store = TestBed.inject(MyStore);
+
+  store.updateValue('new value');
+
+  expect(store.value()).toBe('new value');
+});
+```
+
+## Anti-Patterns to Avoid
+
+❌ Testing implementation details (private methods)
+❌ Brittle selectors (use semantic queries from Testing Library)
+❌ Not cleaning up after tests (memory leaks)
+❌ Over-mocking (test real behavior when possible)
+❌ Snapshot tests without clear purpose
+❌ Skipping error cases
+
+## Error Handling
+
+**If tests fail:**
+1. Analyze failure output
+2. Fix test or identify product bug
+3. Iterate up to 3 times
+4. If still blocked, report:
+   ```
+   ⚠ Tests failing: [specific failure]
+   Failures: [X/Y tests failing]
+   Error: [concise error message]
+   Attempted: [what you tried]
+   Next step: [recommendation]
+   ```
+
+## Integration with Test Migration
+
+**If migrating from Jest:**
+- Load test-migration-specialist skill
+- Convert Spectator → Angular Testing Library
+- Replace Jest matchers with Vitest
+- Update mock patterns (jest.fn → vi.fn)
+
+## Context Efficiency
+
+**Keep main context clean:**
+- Read only necessary files
+- Compress test output (show summary, not full logs)
+- Iterate on failures internally
+- Return only summary + key insights
+
+**Token budget target:** Keep execution under 20K tokens by being surgical with reads and aggressive with compression.

.claude/agents/typescript-pro.md

@@ -1,6 +1,6 @@
 ---
 name: typescript-pro
-description: Write idiomatic TypeScript with advanced type system features, strict typing, and modern patterns. Masters generic constraints, conditional types, and type inference. Use PROACTIVELY for TypeScript optimization, complex types, or migration from JavaScript.
+description: Writes advanced TypeScript with generic constraints, conditional/mapped types, and custom type guards. Use PROACTIVELY when creating type utilities, migrating JavaScript to TypeScript, resolving complex type inference issues, or implementing strict typing.
 tools: Read, Write, Edit, Bash
 model: sonnet
 ---

.claude/agents/ui-ux-designer.md

@@ -1,36 +0,0 @@
----
-name: ui-ux-designer
-description: UI/UX design specialist for user-centered design and interface systems. Use PROACTIVELY for user research, wireframes, design systems, prototyping, accessibility standards, and user experience optimization.
-tools: Read, Write, Edit
-model: sonnet
----
-
-You are a UI/UX designer specializing in user-centered design and interface systems.
-
-## Focus Areas
-
-- User research and persona development
-- Wireframing and prototyping workflows
-- Design system creation and maintenance
-- Accessibility and inclusive design principles
-- Information architecture and user flows
-- Usability testing and iteration strategies
-
-## Approach
-
-1. User needs first - design with empathy and data
-2. Progressive disclosure for complex interfaces
-3. Consistent design patterns and components
-4. Mobile-first responsive design thinking
-5. Accessibility built-in from the start
-
-## Output
-
-- User journey maps and flow diagrams
-- Low and high-fidelity wireframes
-- Design system components and guidelines
-- Prototype specifications for development
-- Accessibility annotations and requirements
-- Usability testing plans and metrics
-
-Focus on solving user problems. Include design rationale and implementation notes.

.claude/commands/commit.md

@@ -29,12 +29,33 @@ Create well-formatted commit: $ARGUMENTS
 6. If multiple distinct changes are detected, suggests breaking the commit into multiple smaller commits
 7. For each commit (or the single commit if not split), creates a commit message using emoji conventional commit format
 
+## Determining the Scope
+
+The scope in commit messages MUST be the `name` field from the affected library's `project.json`:
+
+1. **Check the file path**: `libs/ui/label/src/...` → Look at `libs/ui/label/project.json`
+2. **Read the project name**: The `"name"` field (e.g., `"name": "ui-label"`)
+3. **Use that as scope**: `feat(ui-label): ...`
+
+**Examples:**
+- File: `libs/remission/feature/remission-list/src/...` → Scope: `remission-feature-remission-list`
+- File: `libs/ui/notice/src/...` → Scope: `ui-notice`
+- File: `apps/isa-app/src/...` → Scope: `isa-app`
+
+**Multi-project changes:**
+- If changes span 2-3 related projects, use the primary one or list them: `feat(ui-label, ui-notice): ...`
+- If changes span many unrelated projects, split into separate commits
+
 ## Best Practices for Commits
 
 - **Verify before committing**: Ensure code is linted, builds correctly, and documentation is updated
 - **Atomic commits**: Each commit should contain related changes that serve a single purpose
 - **Split large changes**: If changes touch multiple concerns, split them into separate commits
-- **Conventional commit format**: Use the format `<type>: <description>` where type is one of:
+- **Conventional commit format**: Use the format `<type>(<scope>): <description>` where:
+  - **scope**: The project name from `project.json` of the affected library (e.g., `ui-label`, `crm-feature-checkout`)
+  - Determine the scope by checking which library/project the changes belong to
+  - If changes span multiple projects, use the primary affected project or split into multiple commits
+  - type is one of:
   - `feat`: A new feature
   - `fix`: A bug fix
   - `docs`: Documentation changes
@@ -122,33 +143,33 @@ When analyzing the diff, consider splitting commits based on these criteria:
 
 ## Examples
 
-Good commit messages:
-- ✨ feat: add user authentication system
-- 🐛 fix: resolve memory leak in rendering process
-- 📝 docs: update API documentation with new endpoints
-- ♻️ refactor: simplify error handling logic in parser
-- 🚨 fix: resolve linter warnings in component files
-- 🧑‍💻 chore: improve developer tooling setup process
-- 👔 feat: implement business logic for transaction validation
-- 🩹 fix: address minor styling inconsistency in header
-- 🚑️ fix: patch critical security vulnerability in auth flow
-- 🎨 style: reorganize component structure for better readability
-- 🔥 fix: remove deprecated legacy code
-- 🦺 feat: add input validation for user registration form
-- 💚 fix: resolve failing CI pipeline tests
-- 📈 feat: implement analytics tracking for user engagement
-- 🔒️ fix: strengthen authentication password requirements
-- ♿️ feat: improve form accessibility for screen readers
+Good commit messages (scope = project name from project.json):
+- ✨ feat(auth-feature-login): add user authentication system
+- 🐛 fix(ui-renderer): resolve memory leak in rendering process
+- 📝 docs(crm-api): update API documentation with new endpoints
+- ♻️ refactor(shared-utils): simplify error handling logic in parser
+- 🚨 fix(ui-label): resolve linter warnings in component files
+- 🧑‍💻 chore(dev-tools): improve developer tooling setup process
+- 👔 feat(checkout-feature): implement business logic for transaction validation
+- 🩹 fix(ui-header): address minor styling inconsistency in header
+- 🚑️ fix(auth-core): patch critical security vulnerability in auth flow
+- 🎨 style(ui-components): reorganize component structure for better readability
+- 🔥 fix(legacy-module): remove deprecated legacy code
+- 🦺 feat(user-registration): add input validation for user registration form
+- 💚 fix(ci-config): resolve failing CI pipeline tests
+- 📈 feat(analytics-feature): implement analytics tracking for user engagement
+- 🔒️ fix(auth-password): strengthen authentication password requirements
+- ♿️ feat(ui-forms): improve form accessibility for screen readers
 
 Example of splitting commits:
-- First commit: ✨ feat: add new solc version type definitions
-- Second commit: 📝 docs: update documentation for new solc versions
-- Third commit: 🔧 chore: update package.json dependencies
-- Fourth commit: 🏷️ feat: add type definitions for new API endpoints
-- Fifth commit: 🧵 feat: improve concurrency handling in worker threads
-- Sixth commit: 🚨 fix: resolve linting issues in new code
-- Seventh commit: ✅ test: add unit tests for new solc version features
-- Eighth commit: 🔒️ fix: update dependencies with security vulnerabilities
+- First commit: ✨ feat(ui-label): add prio-label component with variant styles
+- Second commit: 📝 docs(ui-label): update README with usage examples
+- Third commit: 🔧 chore(ui-notice): scaffold new notice library
+- Fourth commit: 🏷️ feat(shared-types): add type definitions for new API endpoints
+- Fifth commit: ♻️ refactor(pickup-shelf): update components to use new label
+- Sixth commit: 🚨 fix(remission-list): resolve linting issues in new code
+- Seventh commit: ✅ test(ui-label): add unit tests for prio-label component
+- Eighth commit: 🔒️ fix(deps): update dependencies with security vulnerabilities
 
 ## Command Options
 

.claude/skills/angular-effects-alternatives/SKILL.md

@@ -0,0 +1,417 @@
+---
+name: angular-effects-alternatives
+description: This skill should be used when writing Angular code with signals and effects. Use when deciding whether to use effect(), computed(), or reactive patterns for state management. Applies to all Angular components and services using signals, especially when considering effect() for state propagation, data synchronization, or reactive flows. Essential for code review of effect usage and refactoring imperative patterns to declarative alternatives.
+---
+
+# Angular Effects Alternatives
+
+## Overview
+
+This skill guides proper usage of Angular's `effect()` and provides declarative alternatives for common patterns. Effects are frequently misused for state propagation, leading to circular updates, maintenance issues, and violations of reactive principles. This skill prevents anti-patterns and promotes maintainable, declarative code.
+
+## When to Use Effects (Valid Use Cases)
+
+Effects are **primarily for rendering content that cannot be rendered through data binding**. Valid use cases are limited to:
+
+### 1. Logging
+Recording application events or debugging:
+
+```typescript
+effect(() => {
+  const error = this.error();
+  if (error) {
+    console.error('Error occurred:', error);
+  }
+});
+```
+
+### 2. Canvas Painting
+Custom graphics rendering (e.g., Angular Three library, Chart.js integration):
+
+```typescript
+effect(() => {
+  const data = this.chartData();
+  this.renderCanvas(data);
+});
+```
+
+### 3. Custom DOM Behavior
+Imperative APIs that require direct DOM manipulation:
+
+```typescript
+effect(() => {
+  const message = this.notificationMessage();
+  if (message) {
+    this.snackBar.open(message, 'Close');
+  }
+});
+```
+
+**Key principle:** Data binding is the preferred way to display data. Effects should only be used when data binding is insufficient.
+
+## Understanding Auto-Tracking
+
+Angular automatically tracks signals accessed during effect execution, **even within called methods**:
+
+```typescript
+effect(() => {
+  this.logError(); // Signal tracking happens inside this method
+});
+
+logError(): void {
+  const error = this.error(); // This signal is automatically tracked
+  if (error) {
+    console.error(error);
+  }
+}
+```
+
+**Implication:** Auto-tracking makes effect dependencies non-obvious and hard to maintain. This is a primary reason to avoid effects for state management.
+
+## When NOT to Use Effects (Anti-Patterns)
+
+### ❌ Anti-Pattern 1: State Propagation
+
+**NEVER use effects to propagate state changes to other state:**
+
+```typescript
+// ❌ WRONG - Anti-pattern
+effect(() => {
+  const value = this.source();
+  this.derived.set(value * 2);
+});
+```
+
+**Problems:**
+- Risk of circular updates and infinite loops
+- Hard to maintain due to implicit tracking
+- Violates declarative reactive principles
+- Inappropriate glitch-free semantics
+
+### ❌ Anti-Pattern 2: Synchronizing Signals
+
+```typescript
+// ❌ WRONG - Anti-pattern
+effect(() => {
+  const filter = this.filter();
+  this.loadData(filter);
+});
+```
+
+### ❌ Anti-Pattern 3: Event Emulation
+
+```typescript
+// ❌ WRONG - Anti-pattern
+effect(() => {
+  const count = this.itemCount();
+  this.countChanged.emit(count);
+});
+```
+
+**Why signals ≠ events:** Signals are designed to be glitch-free, collapsing multiple updates. This makes them inappropriate for representing discrete events.
+
+## Decision Tree: Effect vs Alternative
+
+```
+Need to react to signal changes?
+│
+├─ Synchronous derivation?
+│  └─ ✅ Use computed()
+│
+├─ Asynchronous derivation?
+│  └─ ✅ Use Resource API
+│
+├─ Complex reactive flow with race conditions?
+│  └─ ✅ Use RxJS (toObservable + operators + toSignal)
+│
+├─ Event-based trigger (not state change)?
+│  └─ ✅ React to event directly, not signal
+│
+├─ Need RxJS operators with signals?
+│  └─ ✅ Use reactive helpers (rxMethod, deriveAsync)
+│
+└─ Rendering non-data-bound content (logging, canvas, imperative API)?
+   └─ ✅ Use effect()
+```
+
+## Recommended Alternatives
+
+### Alternative 1: Use `computed()` for Synchronous Derivations
+
+**When to use:** Deriving new state synchronously from existing signals.
+
+```typescript
+// ✅ CORRECT - Declarative
+const derived = computed(() => {
+  return this.baseSignal() * 2;
+});
+
+const fullName = computed(() => {
+  return `${this.firstName()} ${this.lastName()}`;
+});
+```
+
+**Benefits:**
+- Declarative and maintainable
+- Automatic dependency tracking
+- Memoized and efficient
+- No risk of circular updates
+
+### Alternative 2: Use Resource API for Asynchronous Derivations
+
+**When to use:** Loading data based on reactive parameters.
+
+```typescript
+// ✅ CORRECT - Declarative async state
+readonly itemsResource = resource({
+  params: this.filter,
+  loader: ({ params, abortSignal }) => {
+    return this.dataService.load(params, abortSignal);
+  }
+});
+
+readonly items = computed(() => this.itemsResource.value() ?? []);
+```
+
+**Benefits:**
+- Automatic race condition handling
+- Built-in loading/error states
+- Declarative parameter tracking
+- Cancellation support
+
+**See also:** `ngrx-resource-api` skill for detailed Resource API patterns.
+
+### Alternative 3: React to Events, Not State Changes
+
+**When to use:** User interactions or DOM events should trigger actions.
+
+```typescript
+// ❌ WRONG - Reacting to signal change
+effect(() => {
+  const searchTerm = this.searchTerm();
+  this.search(searchTerm);
+});
+
+// ✅ CORRECT - React to event
+<input (input)="search($event.target.value)" />
+
+// Component
+search(term: string): void {
+  this.searchTerm.set(term);
+  this.performSearch(term);
+}
+```
+
+**Benefits:**
+- Clear causality (event → action)
+- No auto-tracking complexity
+- Explicit control flow
+
+### Alternative 4: RxJS Integration
+
+**When to use:** Complex reactive flows requiring operators like `debounceTime`, `switchMap`, `combineLatest`.
+
+```typescript
+// ✅ CORRECT - RxJS for complex flows
+readonly searchTerm = signal('');
+readonly searchTerm$ = toObservable(this.searchTerm);
+
+readonly results$ = this.searchTerm$.pipe(
+  debounceTime(300),
+  distinctUntilChanged(),
+  switchMap(term => this.searchService.search(term))
+);
+
+readonly results = toSignal(this.results$, { initialValue: [] });
+```
+
+**Benefits:**
+- Full RxJS operator ecosystem
+- Race condition prevention (`switchMap`)
+- Powerful composition
+- Type-safe streams
+
+**Pattern:** Signal → Observable (toObservable) → RxJS operators → Signal (toSignal)
+
+### Alternative 5: Reactive Helpers
+
+**When to use:** Need RxJS operators but prefer signal-centric API.
+
+#### Using `rxMethod` (NgRx Signal Store)
+
+```typescript
+readonly loadItem = rxMethod<number>(
+  pipe(
+    tap(() => patchState(this, { loading: true })),
+    switchMap(id => this.service.findById(id)),
+    tap(item => patchState(this, { item, loading: false }))
+  )
+);
+
+// Call with signal or value
+constructor() {
+  this.loadItem(this.selectedId);
+}
+```
+
+#### Using `deriveAsync` (ngxtension)
+
+```typescript
+readonly data = deriveAsync(() => {
+  const filter = this.filter();
+  return this.service.load(filter);
+});
+```
+
+**Benefits:**
+- Signal-friendly API
+- RxJS operator support
+- Cleaner than manual Observable conversion
+- Automatic subscription management
+
+## The `explicitEffect` Consideration
+
+Some libraries provide `explicitEffect` to restrict auto-tracking:
+
+```typescript
+// Uses untracked() internally to limit tracking
+explicitEffect(this.id, (id) => {
+  this.store.load(id);
+});
+```
+
+**Evaluation:**
+- ✅ Mitigates auto-tracking drawbacks
+- ✅ Makes dependencies explicit
+- ❌ Still imperative (not declarative)
+- ❌ Doesn't solve circular update risks
+- ❌ Less idiomatic than reactive alternatives
+
+**Recommendation:** Prefer declarative patterns (computed, Resource API, RxJS) over `explicitEffect`.
+
+## Common Refactoring Patterns
+
+### Pattern 1: Effect for State Sync → computed()
+
+```typescript
+// ❌ Before
+effect(() => {
+  const x = this.x();
+  const y = this.y();
+  this.sum.set(x + y);
+});
+
+// ✅ After
+readonly sum = computed(() => this.x() + this.y());
+```
+
+### Pattern 2: Effect for Async Load → Resource API
+
+```typescript
+// ❌ Before
+effect(() => {
+  const id = this.selectedId();
+  this.loadItem(id);
+});
+
+// ✅ After
+readonly itemResource = resource({
+  params: this.selectedId,
+  loader: ({ params }) => this.service.loadItem(params)
+});
+```
+
+### Pattern 3: Effect for Debounced Search → RxJS
+
+```typescript
+// ❌ Before
+effect(() => {
+  const term = this.searchTerm();
+  // No way to debounce within effect
+  this.search(term);
+});
+
+// ✅ After
+readonly searchTerm$ = toObservable(this.searchTerm);
+readonly results = toSignal(
+  this.searchTerm$.pipe(
+    debounceTime(300),
+    switchMap(term => this.searchService.search(term))
+  ),
+  { initialValue: [] }
+);
+```
+
+### Pattern 4: Effect for Event Notification → Direct Event Handling
+
+```typescript
+// ❌ Before
+effect(() => {
+  const value = this.value();
+  this.valueChange.emit(value);
+});
+
+// ✅ After
+updateValue(newValue: string): void {
+  this.value.set(newValue);
+  this.valueChange.emit(newValue);
+}
+```
+
+## Code Review Checklist
+
+When reviewing code with `effect()`, ask:
+
+- [ ] Is this for rendering non-data-bound content? (logging, canvas, imperative APIs)
+  - **YES:** Effect is appropriate
+  - **NO:** Continue checklist
+
+- [ ] Is this synchronous state derivation?
+  - **YES:** Use `computed()` instead
+
+- [ ] Is this asynchronous data loading?
+  - **YES:** Use Resource API instead
+
+- [ ] Does this need RxJS operators (debounce, switchMap, etc.)?
+  - **YES:** Use RxJS integration or reactive helpers instead
+
+- [ ] Is this reacting to a user event?
+  - **YES:** Handle event directly instead
+
+- [ ] Could this cause circular updates?
+  - **YES:** Refactor immediately - this will cause bugs
+
+## Anti-Pattern Detection Rules
+
+Flag any effect that:
+
+1. **Calls `set()` or `update()` on signals** - Likely state propagation anti-pattern
+2. **Calls service methods that update state** - Hidden state propagation
+3. **Emits events based on signal changes** - Signal/event semantic mismatch
+4. **Has try/catch for async operations** - Should use Resource API
+5. **Would benefit from debouncing/throttling** - Should use RxJS
+
+## Migration Strategy
+
+When converting effects to alternatives:
+
+1. **Identify effect purpose** - State derivation? Async load? Event handling?
+2. **Choose appropriate alternative** - Use decision tree above
+3. **Implement replacement** - Follow patterns in this skill
+4. **Test thoroughly** - Ensure reactive flow works correctly
+5. **Remove effect** - Clean up unused code
+
+## Key Principles
+
+1. **Effects are for side effects, not state management**
+2. **Prefer declarative over imperative**
+3. **Use computed() for sync, Resource API for async**
+4. **React to events, not state changes**
+5. **RxJS for complex reactive flows**
+6. **Auto-tracking is powerful but opaque - avoid when possible**
+
+## When in Doubt
+
+Ask: "Can the user see this without an effect using data binding?"
+- **YES:** Don't use effect, use data binding
+- **NO:** Effect might be appropriate (but verify against decision tree)

.claude/skills/api-change-analyzer/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: api-change-analyzer
-description: This skill should be used when analyzing Swagger/OpenAPI specification changes BEFORE regenerating API clients. It compares old vs new specs, categorizes changes as breaking/compatible/warnings, finds affected code, and generates migration strategies. Use this skill when the user wants to check API changes safely before sync, mentions "check breaking changes", or needs impact assessment.
+description: This skill should be used when checking for breaking changes before API regeneration, assessing backend API update impact, or user mentions "check breaking changes", "API diff", "impact assessment". Analyzes Swagger/OpenAPI spec changes, categorizes as breaking/compatible/warnings, and provides migration strategies.
 ---
 
 # API Change Analyzer

.claude/skills/architecture-enforcer/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: architecture-enforcer
-description: This skill should be used when validating import boundaries and architectural rules in the ISA-Frontend monorepo. It checks for circular dependencies, layer violations (Feature→Feature), domain violations (OMS→Remission), and relative imports. Use this skill when the user wants to check architecture, mentions "validate boundaries", "check imports", or needs dependency analysis.
+description: This skill should be used when checking architecture compliance, validating layer boundaries (Feature→Feature violations), detecting circular dependencies, or user mentions "check architecture", "validate boundaries", "check imports". Validates import boundaries and architectural rules in ISA-Frontend monorepo.
 ---
 
 # Architecture Enforcer

.claude/skills/circular-dependency-resolver/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: circular-dependency-resolver
-description: This skill should be used when detecting and resolving circular dependencies in the ISA-Frontend monorepo. It uses graph algorithms to find A→B→C→A cycles, categorizes by severity, provides multiple fix strategies (DI, interface extraction, shared code), and validates fixes. Use this skill when the user mentions "circular dependencies", "dependency cycles", or has build/runtime issues from circular imports.
+description: This skill should be used when build fails with circular import warnings, user mentions "circular dependencies" or "dependency cycles", or fixing A→B→C→A import cycles. Detects and resolves circular dependencies using graph algorithms with DI, interface extraction, and shared code fix strategies.
 ---
 
 # Circular Dependency Resolver

.claude/skills/css-keyframes-animations/SKILL.md

@@ -0,0 +1,392 @@
+---
+name: css-keyframes-animations
+description: This skill should be used when writing or reviewing CSS animations in Angular components. Use when creating entrance/exit animations, implementing @keyframes instead of @angular/animations, applying timing functions and fill modes, creating staggered animations, or ensuring GPU-accelerated performance. Essential for modern Angular 20+ components using animate.enter/animate.leave directives and converting legacy Angular animations to native CSS.
+---
+
+# CSS @keyframes Animations
+
+## Overview
+
+Implement native CSS @keyframes animations for Angular applications, replacing @angular/animations with GPU-accelerated, zero-bundle-size alternatives. This skill provides comprehensive guidance on creating performant entrance/exit animations, staggered effects, and proper timing configurations.
+
+## When to Use This Skill
+
+Apply this skill when:
+- **Writing Angular components** with entrance/exit animations
+- **Converting @angular/animations** to native CSS @keyframes
+- **Implementing animate.enter/animate.leave** in Angular 20+ templates
+- **Creating staggered animations** for lists or collections
+- **Debugging animation issues** (snap-back, wrong starting positions, choppy playback)
+- **Optimizing animation performance** for GPU acceleration
+- **Reviewing animation code** for accessibility and best practices
+
+## Quick Start
+
+### Basic Animation Setup
+
+1. **Define @keyframes** in component CSS:
+```css
+@keyframes fadeIn {
+  from { opacity: 0; }
+  to { opacity: 1; }
+}
+```
+
+2. **Apply animation** to element:
+```css
+.element {
+  animation: fadeIn 0.3s ease-out;
+}
+```
+
+3. **Use with Angular 20+ directives**:
+```html
+@if (visible()) {
+  <div animate.enter="fade-in" animate.leave="fade-out">
+    Content
+  </div>
+}
+```
+
+### Common Pitfall: Element Snaps Back
+
+**Problem:** Element returns to original state after animation completes.
+
+**Solution:** Add `forwards` fill mode:
+```css
+.element {
+  animation: fadeOut 1s forwards;
+}
+```
+
+### Common Pitfall: Animation Conflicts with State Transitions
+
+**Problem:** Entrance animation overrides initial state transforms (e.g., stacked cards appear unstacked then jump).
+
+**Solution:** Animate only properties that don't conflict with state. Use opacity-only animations when transforms are state-driven:
+```css
+/* BAD: Overrides stacked transform */
+@keyframes cardEntrance {
+  from { transform: translateY(20px); opacity: 0; }
+  to { transform: translateY(0); opacity: 1; }
+}
+
+/* GOOD: Only animates opacity, allows state transforms to apply */
+@keyframes cardEntrance {
+  from { opacity: 0; }
+  to { opacity: 1; }
+}
+```
+
+## Core Principles
+
+### 1. GPU-Accelerated Properties Only
+
+**Always use** for animations:
+- `transform` (translate, rotate, scale)
+- `opacity`
+
+**Avoid animating** (triggers layout recalculation):
+- `width`, `height`
+- `top`, `left`, `right`, `bottom`
+- `margin`, `padding`
+- `font-size`
+
+### 2. Fill Modes
+
+| Fill Mode | Behavior | Use Case |
+|-----------|----------|----------|
+| `forwards` | Keep end state | Exit animations (stay invisible) |
+| `backwards` | Apply start state during delay | Entrance with delay (prevent flash) |
+| `both` | Both of above | Complex sequences |
+
+### 3. Timing Functions
+
+Choose appropriate easing for animation type:
+
+```css
+/* Entrance animations - ease-out (fast start, slow end) */
+animation-timing-function: cubic-bezier(0, 0, 0.58, 1);
+
+/* Exit animations - ease-in (slow start, fast end) */
+animation-timing-function: cubic-bezier(0.42, 0, 1, 1);
+
+/* Bouncy overshoot effect */
+animation-timing-function: cubic-bezier(0.34, 1.56, 0.64, 1);
+```
+
+Tool: [cubic-bezier.com](https://cubic-bezier.com) for custom curves.
+
+### 4. Staggered Animations
+
+Create cascading effects using CSS custom properties:
+
+**Template:**
+```html
+@for (item of items(); track item.id; let idx = $index) {
+  <div [style.--i]="idx" class="stagger-item">
+    {{ item.name }}
+  </div>
+}
+```
+
+**CSS:**
+```css
+.stagger-item {
+  animation: fadeSlideIn 0.5s ease-out backwards;
+  animation-delay: calc(var(--i, 0) * 100ms);
+}
+```
+
+### 5. Accessibility
+
+Always respect reduced motion preferences:
+
+```css
+@media (prefers-reduced-motion: reduce) {
+  .animated {
+    animation: none;
+    /* Or use simpler, faster animation */
+    animation-duration: 0.1s;
+  }
+}
+```
+
+## Common Animation Patterns
+
+### Fade Entrance/Exit
+
+```css
+@keyframes fadeIn {
+  from { opacity: 0; }
+  to { opacity: 1; }
+}
+
+@keyframes fadeOut {
+  from { opacity: 1; }
+  to { opacity: 0; }
+}
+
+.fade-in { animation: fadeIn 0.3s ease-out; }
+.fade-out { animation: fadeOut 0.3s ease-in forwards; }
+```
+
+### Slide Entrance
+
+```css
+@keyframes slideInUp {
+  from {
+    opacity: 0;
+    transform: translateY(20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.slide-in-up { animation: slideInUp 0.3s ease-out; }
+```
+
+### Scale Entrance
+
+```css
+@keyframes scaleIn {
+  from {
+    opacity: 0;
+    transform: scale(0.9);
+  }
+  to {
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+
+.scale-in { animation: scaleIn 0.2s ease-out; }
+```
+
+### Loading Spinner
+
+```css
+@keyframes spin {
+  to { transform: rotate(360deg); }
+}
+
+.spinner {
+  width: 40px;
+  height: 40px;
+  border: 3px solid #f3f3f3;
+  border-top: 3px solid #3498db;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+```
+
+### Shake (Error Feedback)
+
+```css
+@keyframes shake {
+  0%, 100% { transform: translateX(0); }
+  10%, 30%, 50%, 70%, 90% { transform: translateX(-5px); }
+  20%, 40%, 60%, 80% { transform: translateX(5px); }
+}
+
+.error-input {
+  animation: shake 0.5s ease-in-out;
+}
+```
+
+## Angular 20+ Integration
+
+### Basic Usage with animate.enter/animate.leave
+
+```typescript
+@Component({
+  template: `
+    @if (show()) {
+      <div animate.enter="fade-in" animate.leave="fade-out">
+        Content
+      </div>
+    }
+  `,
+  styles: [`
+    .fade-in { animation: fadeIn 0.3s ease-out; }
+    .fade-out { animation: fadeOut 0.3s ease-in forwards; }
+
+    @keyframes fadeIn {
+      from { opacity: 0; }
+      to { opacity: 1; }
+    }
+
+    @keyframes fadeOut {
+      from { opacity: 1; }
+      to { opacity: 0; }
+    }
+  `]
+})
+```
+
+### Dynamic Animation Classes
+
+```typescript
+@Component({
+  template: `
+    @if (show()) {
+      <div [animate.enter]="enterAnim()" [animate.leave]="leaveAnim()">
+        Content
+      </div>
+    }
+  `
+})
+export class DynamicAnimComponent {
+  show = signal(false);
+  enterAnim = signal('slide-in-up');
+  leaveAnim = signal('slide-out-down');
+}
+```
+
+## Debugging Animations
+
+### Common Issues
+
+| Problem | Cause | Solution |
+|---------|-------|----------|
+| Animation doesn't run | Missing duration | Add `animation-duration: 0.3s` |
+| Element snaps back | No fill mode | Add `animation-fill-mode: forwards` |
+| Wrong starting position during delay | No backwards fill | Add `animation-fill-mode: backwards` |
+| Choppy animation | Animating layout properties | Use `transform` instead |
+| State conflict (jump/snap) | Animation overrides state transforms | Animate only opacity, not transform |
+
+### Browser DevTools
+
+- **Chrome DevTools** → More Tools → Animations panel
+- **Firefox DevTools** → Inspector → Animations tab
+
+### Animation Events
+
+```typescript
+element.addEventListener('animationend', (e) => {
+  console.log('Animation completed:', e.animationName);
+  // Clean up, remove element, etc.
+});
+```
+
+## Resources
+
+### references/keyframes-guide.md
+
+Comprehensive deep-dive covering:
+- Complete @keyframes syntax reference
+- Detailed timing functions and cubic-bezier curves
+- Advanced techniques (direction, play-state, @starting-style)
+- Performance optimization strategies
+- Extensive common patterns library
+- Debugging techniques and troubleshooting
+
+**When to reference:** Complex animation requirements, custom easing curves, advanced techniques, performance optimization, or learning comprehensive details.
+
+### assets/animations.css
+
+Ready-to-use CSS file with common animation patterns:
+- Fade animations (in/out)
+- Slide animations (up/down/left/right)
+- Scale animations (in/out)
+- Utility animations (spin, shimmer, shake, breathe, attention-pulse)
+- Toast/notification animations
+- Accessibility (@media prefers-reduced-motion)
+
+**Usage:** Copy this file to project and import in component styles or global styles:
+
+```css
+@import 'path/to/animations.css';
+```
+
+Then use classes directly:
+```html
+<div animate.enter="fade-in" animate.leave="slide-out-down">
+```
+
+## Migration from @angular/animations
+
+### Before (Angular Animations)
+
+```typescript
+import { trigger, state, style, transition, animate } from '@angular/animations';
+
+@Component({
+  animations: [
+    trigger('fadeIn', [
+      transition(':enter', [
+        style({ opacity: 0 }),
+        animate('300ms ease-out', style({ opacity: 1 }))
+      ])
+    ])
+  ]
+})
+```
+
+### After (CSS @keyframes)
+
+```typescript
+@Component({
+  template: `
+    @if (show()) {
+      <div animate.enter="fade-in">Content</div>
+    }
+  `,
+  styles: [`
+    .fade-in { animation: fadeIn 0.3s ease-out; }
+
+    @keyframes fadeIn {
+      from { opacity: 0; }
+      to { opacity: 1; }
+    }
+  `]
+})
+```
+
+**Benefits:**
+- Zero JavaScript bundle size (~60KB savings)
+- GPU hardware acceleration
+- Standard CSS (transferable skills)
+- Better performance

.claude/skills/css-keyframes-animations/assets/animations.css

@@ -0,0 +1,278 @@
+/**
+ * Reusable CSS @keyframes Animations
+ *
+ * Common animation patterns for Angular applications.
+ * Import this file in your component styles or global styles.
+ */
+
+/* ============================================
+   FADE ANIMATIONS
+   ============================================ */
+
+@keyframes fadeIn {
+  from { opacity: 0; }
+  to { opacity: 1; }
+}
+
+@keyframes fadeOut {
+  from { opacity: 1; }
+  to { opacity: 0; }
+}
+
+.fade-in {
+  animation: fadeIn 0.3s ease-out;
+}
+
+.fade-out {
+  animation: fadeOut 0.3s ease-in;
+}
+
+/* ============================================
+   SLIDE ANIMATIONS
+   ============================================ */
+
+@keyframes slideInUp {
+  from {
+    opacity: 0;
+    transform: translateY(20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+@keyframes slideOutDown {
+  from {
+    opacity: 1;
+    transform: translateY(0);
+  }
+  to {
+    opacity: 0;
+    transform: translateY(20px);
+  }
+}
+
+@keyframes slideInDown {
+  from {
+    opacity: 0;
+    transform: translateY(-20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+@keyframes slideOutUp {
+  from {
+    opacity: 1;
+    transform: translateY(0);
+  }
+  to {
+    opacity: 0;
+    transform: translateY(-20px);
+  }
+}
+
+@keyframes slideInLeft {
+  from {
+    opacity: 0;
+    transform: translateX(-20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateX(0);
+  }
+}
+
+@keyframes slideOutLeft {
+  from {
+    opacity: 1;
+    transform: translateX(0);
+  }
+  to {
+    opacity: 0;
+    transform: translateX(-20px);
+  }
+}
+
+@keyframes slideInRight {
+  from {
+    opacity: 0;
+    transform: translateX(20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateX(0);
+  }
+}
+
+@keyframes slideOutRight {
+  from {
+    opacity: 1;
+    transform: translateX(0);
+  }
+  to {
+    opacity: 0;
+    transform: translateX(20px);
+  }
+}
+
+.slide-in-up { animation: slideInUp 0.3s ease-out; }
+.slide-out-down { animation: slideOutDown 0.3s ease-in; }
+.slide-in-down { animation: slideInDown 0.3s ease-out; }
+.slide-out-up { animation: slideOutUp 0.3s ease-in; }
+.slide-in-left { animation: slideInLeft 0.3s ease-out; }
+.slide-out-left { animation: slideOutLeft 0.3s ease-in; }
+.slide-in-right { animation: slideInRight 0.3s ease-out; }
+.slide-out-right { animation: slideOutRight 0.3s ease-in; }
+
+/* ============================================
+   SCALE ANIMATIONS
+   ============================================ */
+
+@keyframes scaleIn {
+  from {
+    opacity: 0;
+    transform: scale(0.9);
+  }
+  to {
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+
+@keyframes scaleOut {
+  from {
+    opacity: 1;
+    transform: scale(1);
+  }
+  to {
+    opacity: 0;
+    transform: scale(0.9);
+  }
+}
+
+.scale-in { animation: scaleIn 0.2s ease-out; }
+.scale-out { animation: scaleOut 0.2s ease-in; }
+
+/* ============================================
+   UTILITY ANIMATIONS
+   ============================================ */
+
+/* Loading Spinner */
+@keyframes spin {
+  to { transform: rotate(360deg); }
+}
+
+.spin {
+  animation: spin 1s linear infinite;
+}
+
+/* Skeleton Loading */
+@keyframes shimmer {
+  0% { background-position: -200% 0; }
+  100% { background-position: 200% 0; }
+}
+
+.shimmer {
+  background: linear-gradient(
+    90deg,
+    #f0f0f0 25%,
+    #e0e0e0 50%,
+    #f0f0f0 75%
+  );
+  background-size: 200% 100%;
+  animation: shimmer 1.5s infinite;
+}
+
+/* Attention Pulse */
+@keyframes attention-pulse {
+  0%, 100% {
+    box-shadow: 0 0 0 0 rgba(59, 130, 246, 0.5);
+  }
+  50% {
+    box-shadow: 0 0 0 10px rgba(59, 130, 246, 0);
+  }
+}
+
+.attention-pulse {
+  animation: attention-pulse 2s ease-in-out infinite;
+}
+
+/* Shake (Error Feedback) */
+@keyframes shake {
+  0%, 100% { transform: translateX(0); }
+  10%, 30%, 50%, 70%, 90% { transform: translateX(-5px); }
+  20%, 40%, 60%, 80% { transform: translateX(5px); }
+}
+
+.shake {
+  animation: shake 0.5s ease-in-out;
+}
+
+/* Breathing/Pulsing */
+@keyframes breathe {
+  0%, 100% {
+    opacity: 1;
+    transform: scale(1);
+  }
+  50% {
+    opacity: 0.7;
+    transform: scale(1.05);
+  }
+}
+
+.breathe {
+  animation: breathe 2s ease-in-out infinite;
+}
+
+/* ============================================
+   TOAST/NOTIFICATION ANIMATIONS
+   ============================================ */
+
+@keyframes toastIn {
+  from {
+    opacity: 0;
+    transform: translateY(100%) scale(0.9);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0) scale(1);
+  }
+}
+
+@keyframes toastOut {
+  from {
+    opacity: 1;
+    transform: translateY(0) scale(1);
+  }
+  to {
+    opacity: 0;
+    transform: translateY(100%) scale(0.9);
+  }
+}
+
+.toast-in {
+  animation: toastIn 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
+}
+
+.toast-out {
+  animation: toastOut 0.2s ease-in forwards;
+}
+
+/* ============================================
+   ACCESSIBILITY
+   ============================================ */
+
+/* Respect user's motion preferences */
+@media (prefers-reduced-motion: reduce) {
+  *,
+  *::before,
+  *::after {
+    animation-duration: 0.01ms !important;
+    animation-iteration-count: 1 !important;
+    transition-duration: 0.01ms !important;
+  }
+}

.claude/skills/css-keyframes-animations/references/keyframes-guide.md

@@ -0,0 +1,833 @@
+# CSS @keyframes Deep Dive
+
+A comprehensive guide for Angular developers transitioning from `@angular/animations` to native CSS animations.
+
+---
+
+## Table of Contents
+
+1. [Understanding @keyframes](#understanding-keyframes)
+2. [Basic Syntax](#basic-syntax)
+3. [Animation Properties](#animation-properties)
+4. [Timing Functions (Easing)](#timing-functions-easing)
+5. [Fill Modes](#fill-modes)
+6. [Advanced Techniques](#advanced-techniques)
+7. [Angular 20+ Integration](#angular-20-integration)
+8. [Common Patterns & Recipes](#common-patterns--recipes)
+9. [Performance Tips](#performance-tips)
+10. [Debugging Animations](#debugging-animations)
+
+---
+
+## Understanding @keyframes
+
+The `@keyframes` at-rule controls the intermediate steps in a CSS animation sequence by defining styles for keyframes (waypoints) along the animation. Unlike transitions (which only animate between two states), keyframes let you define multiple intermediate steps.
+
+### How It Differs from @angular/animations
+
+| @angular/animations | Native CSS @keyframes |
+|---------------------|----------------------|
+| ~60KB JavaScript bundle | Zero JS overhead |
+| CPU-based rendering | GPU hardware acceleration |
+| Angular-specific syntax | Standard CSS (transferable skills) |
+| `trigger()`, `state()`, `animate()` | `@keyframes` + CSS classes |
+
+---
+
+## Basic Syntax
+
+### The @keyframes Rule
+
+```css
+@keyframes animation-name {
+  from {
+    /* Starting styles (same as 0%) */
+  }
+  to {
+    /* Ending styles (same as 100%) */
+  }
+}
+```
+
+### Percentage-Based Keyframes
+
+For more control, use percentages to define multiple waypoints:
+
+```css
+@keyframes bounce {
+  0% {
+    transform: translateY(0);
+  }
+  25% {
+    transform: translateY(-30px);
+  }
+  50% {
+    transform: translateY(0);
+  }
+  75% {
+    transform: translateY(-15px);
+  }
+  100% {
+    transform: translateY(0);
+  }
+}
+```
+
+### Combining Multiple Percentages
+
+You can apply the same styles to multiple keyframes:
+
+```css
+@keyframes pulse {
+  0%, 100% {
+    opacity: 1;
+    transform: scale(1);
+  }
+  50% {
+    opacity: 0.7;
+    transform: scale(1.05);
+  }
+}
+```
+
+### Applying the Animation
+
+```css
+.element {
+  animation: bounce 1s ease-in-out infinite;
+}
+```
+
+---
+
+## Animation Properties
+
+### Individual Properties
+
+| Property | Description | Example |
+|----------|-------------|---------|
+| `animation-name` | Name of the @keyframes | `animation-name: bounce;` |
+| `animation-duration` | How long one cycle takes | `animation-duration: 2s;` |
+| `animation-timing-function` | Speed curve (easing) | `animation-timing-function: ease-in;` |
+| `animation-delay` | Wait before starting | `animation-delay: 500ms;` |
+| `animation-iteration-count` | How many times to run | `animation-iteration-count: 3;` or `infinite` |
+| `animation-direction` | Forward, reverse, or alternate | `animation-direction: alternate;` |
+| `animation-fill-mode` | Styles before/after animation | `animation-fill-mode: forwards;` |
+| `animation-play-state` | Pause or play | `animation-play-state: paused;` |
+
+### Shorthand Syntax
+
+```css
+/* animation: name duration timing-function delay iteration-count direction fill-mode play-state */
+.element {
+  animation: slideIn 0.5s ease-out 0.2s 1 normal forwards running;
+}
+```
+
+**Minimum required:** name and duration
+
+```css
+.element {
+  animation: fadeIn 1s;
+}
+```
+
+### Multiple Animations
+
+Apply multiple animations to a single element:
+
+```css
+.element {
+  animation:
+    fadeIn 0.5s ease-out,
+    slideUp 0.5s ease-out,
+    pulse 2s ease-in-out 0.5s infinite;
+}
+```
+
+---
+
+## Timing Functions (Easing)
+
+The timing function controls how the animation progresses over time—where it speeds up and slows down.
+
+### Keyword Values
+
+| Keyword | Cubic-Bezier Equivalent | Description |
+|---------|------------------------|-------------|
+| `linear` | `cubic-bezier(0, 0, 1, 1)` | Constant speed |
+| `ease` | `cubic-bezier(0.25, 0.1, 0.25, 1)` | Default: slow start, fast middle, slow end |
+| `ease-in` | `cubic-bezier(0.42, 0, 1, 1)` | Slow start, fast end |
+| `ease-out` | `cubic-bezier(0, 0, 0.58, 1)` | Fast start, slow end |
+| `ease-in-out` | `cubic-bezier(0.42, 0, 0.58, 1)` | Slow start and end |
+
+### Custom Cubic-Bezier
+
+Create custom easing curves with `cubic-bezier(x1, y1, x2, y2)`:
+
+```css
+/* Bouncy overshoot effect */
+.element {
+  animation-timing-function: cubic-bezier(0.68, -0.6, 0.32, 1.6);
+}
+
+/* Smooth deceleration */
+.element {
+  animation-timing-function: cubic-bezier(0.25, 1, 0.5, 1);
+}
+```
+
+**Tool:** Use [cubic-bezier.com](https://cubic-bezier.com) to visualize and create custom curves.
+
+### Popular Easing Functions
+
+```css
+/* Ease Out Quart - Great for enter animations */
+cubic-bezier(0.25, 1, 0.5, 1)
+
+/* Ease In Out Cubic - Smooth state changes */
+cubic-bezier(0.65, 0, 0.35, 1)
+
+/* Ease Out Back - Slight overshoot */
+cubic-bezier(0.34, 1.56, 0.64, 1)
+
+/* Ease In Out Back - Overshoot both ends */
+cubic-bezier(0.68, -0.6, 0.32, 1.6)
+```
+
+### Steps Function
+
+For frame-by-frame animations (like sprite sheets):
+
+```css
+/* 6 discrete steps */
+.sprite {
+  animation: walk 1s steps(6) infinite;
+}
+
+/* Step positions */
+steps(4, jump-start)  /* Jump at start of each interval */
+steps(4, jump-end)    /* Jump at end of each interval (default) */
+steps(4, jump-both)   /* Jump at both ends */
+steps(4, jump-none)   /* No jump at ends */
+```
+
+### Timing Function Per Keyframe
+
+Apply different easing to different segments:
+
+```css
+@keyframes complexMove {
+  0% {
+    transform: translateX(0);
+    animation-timing-function: ease-out;
+  }
+  50% {
+    transform: translateX(100px);
+    animation-timing-function: ease-in;
+  }
+  100% {
+    transform: translateX(200px);
+  }
+}
+```
+
+**Important:** The timing function applies to each step individually, not the entire animation.
+
+---
+
+## Fill Modes
+
+Fill modes control what styles apply before and after the animation runs.
+
+### Values
+
+| Value | Before Animation | After Animation |
+|-------|-----------------|-----------------|
+| `none` | Original styles | Original styles |
+| `forwards` | Original styles | **Last keyframe styles** |
+| `backwards` | **First keyframe styles** | Original styles |
+| `both` | **First keyframe styles** | **Last keyframe styles** |
+
+### Common Problem: Element Snaps Back
+
+```css
+/* BAD: Element disappears then reappears after animation */
+@keyframes fadeOut {
+  from { opacity: 1; }
+  to { opacity: 0; }
+}
+
+.element {
+  animation: fadeOut 1s; /* Element snaps back to opacity: 1 */
+}
+
+/* GOOD: Element stays invisible */
+.element {
+  animation: fadeOut 1s forwards;
+}
+```
+
+### Backwards Fill Mode (for delays)
+
+```css
+@keyframes slideIn {
+  from {
+    transform: translateX(-100%);
+    opacity: 0;
+  }
+  to {
+    transform: translateX(0);
+    opacity: 1;
+  }
+}
+
+/* Without backwards: element visible at original position during delay */
+/* With backwards: element starts at first keyframe position during delay */
+.element {
+  animation: slideIn 0.5s ease-out 1s backwards;
+}
+```
+
+---
+
+## Advanced Techniques
+
+### Animation Direction
+
+Control playback direction:
+
+```css
+animation-direction: normal;           /* 0% → 100% */
+animation-direction: reverse;          /* 100% → 0% */
+animation-direction: alternate;        /* 0% → 100% → 0% */
+animation-direction: alternate-reverse; /* 100% → 0% → 100% */
+```
+
+**Use Case:** Breathing/pulsing effects
+
+```css
+@keyframes breathe {
+  from { transform: scale(1); }
+  to { transform: scale(1.1); }
+}
+
+.element {
+  animation: breathe 2s ease-in-out infinite alternate;
+}
+```
+
+### Staggered Animations
+
+Create cascading effects with animation-delay:
+
+```css
+.item { animation: fadeSlideIn 0.5s ease-out backwards; }
+.item:nth-child(1) { animation-delay: 0ms; }
+.item:nth-child(2) { animation-delay: 100ms; }
+.item:nth-child(3) { animation-delay: 200ms; }
+.item:nth-child(4) { animation-delay: 300ms; }
+
+/* Or use CSS custom properties */
+.item {
+  animation: fadeSlideIn 0.5s ease-out backwards;
+  animation-delay: calc(var(--i, 0) * 100ms);
+}
+```
+
+In your template:
+
+```html
+<div class="item" style="--i: 0">First</div>
+<div class="item" style="--i: 1">Second</div>
+<div class="item" style="--i: 2">Third</div>
+```
+
+### @starting-style (Modern CSS)
+
+Define styles for when an element first enters the DOM:
+
+```css
+.modal {
+  opacity: 1;
+  transform: scale(1);
+  transition: opacity 0.3s, transform 0.3s;
+
+  @starting-style {
+    opacity: 0;
+    transform: scale(0.9);
+  }
+}
+```
+
+### Animating Auto Height
+
+Use CSS Grid for height: auto animations:
+
+```css
+.accordion-content {
+  display: grid;
+  grid-template-rows: 0fr;
+  transition: grid-template-rows 0.3s ease-out;
+}
+
+.accordion-content.open {
+  grid-template-rows: 1fr;
+}
+
+.accordion-content > div {
+  overflow: hidden;
+}
+```
+
+### Pause/Play with CSS
+
+```css
+.element {
+  animation: spin 2s linear infinite;
+  animation-play-state: running;
+}
+
+.element:hover {
+  animation-play-state: paused;
+}
+
+/* Or with a class */
+.element.paused {
+  animation-play-state: paused;
+}
+```
+
+---
+
+## Angular 20+ Integration
+
+### Using animate.enter and animate.leave
+
+Angular 20.2+ provides `animate.enter` and `animate.leave` to apply CSS classes when elements enter/leave the DOM.
+
+```typescript
+@Component({
+  selector: 'app-example',
+  template: `
+    @if (isVisible()) {
+      <div animate.enter="fade-in" animate.leave="fade-out">
+        Content here
+      </div>
+    }
+    <button (click)="toggle()">Toggle</button>
+  `,
+  styles: [`
+    .fade-in {
+      animation: fadeIn 0.3s ease-out;
+    }
+
+    .fade-out {
+      animation: fadeOut 0.3s ease-in;
+    }
+
+    @keyframes fadeIn {
+      from { opacity: 0; }
+      to { opacity: 1; }
+    }
+
+    @keyframes fadeOut {
+      from { opacity: 1; }
+      to { opacity: 0; }
+    }
+  `]
+})
+export class ExampleComponent {
+  isVisible = signal(false);
+  toggle() { this.isVisible.update(v => !v); }
+}
+```
+
+### Dynamic Animation Classes
+
+```typescript
+@Component({
+  template: `
+    @if (show()) {
+      <div [animate.enter]="enterAnimation()" [animate.leave]="leaveAnimation()">
+        Dynamic animations!
+      </div>
+    }
+  `
+})
+export class DynamicAnimComponent {
+  show = signal(false);
+  enterAnimation = signal('slide-in-right');
+  leaveAnimation = signal('slide-out-left');
+}
+```
+
+### Reusable Animation CSS File
+
+Create a shared `animations.css`:
+
+```css
+/* animations.css */
+
+/* Fade animations */
+.fade-in { animation: fadeIn 0.3s ease-out; }
+.fade-out { animation: fadeOut 0.3s ease-in; }
+
+@keyframes fadeIn {
+  from { opacity: 0; }
+  to { opacity: 1; }
+}
+
+@keyframes fadeOut {
+  from { opacity: 1; }
+  to { opacity: 0; }
+}
+
+/* Slide animations */
+.slide-in-up { animation: slideInUp 0.3s ease-out; }
+.slide-out-down { animation: slideOutDown 0.3s ease-in; }
+
+@keyframes slideInUp {
+  from {
+    opacity: 0;
+    transform: translateY(20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+@keyframes slideOutDown {
+  from {
+    opacity: 1;
+    transform: translateY(0);
+  }
+  to {
+    opacity: 0;
+    transform: translateY(20px);
+  }
+}
+
+/* Scale animations */
+.scale-in { animation: scaleIn 0.2s ease-out; }
+.scale-out { animation: scaleOut 0.2s ease-in; }
+
+@keyframes scaleIn {
+  from {
+    opacity: 0;
+    transform: scale(0.9);
+  }
+  to {
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+
+@keyframes scaleOut {
+  from {
+    opacity: 1;
+    transform: scale(1);
+  }
+  to {
+    opacity: 0;
+    transform: scale(0.9);
+  }
+}
+```
+
+Import in `styles.css` or `angular.json`:
+
+```css
+@import 'animations.css';
+```
+
+---
+
+## Common Patterns & Recipes
+
+### Loading Spinner
+
+```css
+@keyframes spin {
+  to { transform: rotate(360deg); }
+}
+
+.spinner {
+  width: 40px;
+  height: 40px;
+  border: 3px solid #f3f3f3;
+  border-top: 3px solid #3498db;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+```
+
+### Skeleton Loading
+
+```css
+@keyframes shimmer {
+  0% { background-position: -200% 0; }
+  100% { background-position: 200% 0; }
+}
+
+.skeleton {
+  background: linear-gradient(
+    90deg,
+    #f0f0f0 25%,
+    #e0e0e0 50%,
+    #f0f0f0 75%
+  );
+  background-size: 200% 100%;
+  animation: shimmer 1.5s infinite;
+}
+```
+
+### Attention Pulse
+
+```css
+@keyframes attention-pulse {
+  0%, 100% {
+    box-shadow: 0 0 0 0 rgba(59, 130, 246, 0.5);
+  }
+  50% {
+    box-shadow: 0 0 0 10px rgba(59, 130, 246, 0);
+  }
+}
+
+.notification-badge {
+  animation: attention-pulse 2s ease-in-out infinite;
+}
+```
+
+### Shake (Error Feedback)
+
+```css
+@keyframes shake {
+  0%, 100% { transform: translateX(0); }
+  10%, 30%, 50%, 70%, 90% { transform: translateX(-5px); }
+  20%, 40%, 60%, 80% { transform: translateX(5px); }
+}
+
+.error-input {
+  animation: shake 0.5s ease-in-out;
+}
+```
+
+### Slide Down Menu
+
+```css
+@keyframes slideDown {
+  from {
+    opacity: 0;
+    transform: translateY(-10px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.dropdown-menu {
+  animation: slideDown 0.2s ease-out forwards;
+}
+```
+
+### Toast Notification
+
+```css
+@keyframes toastIn {
+  from {
+    opacity: 0;
+    transform: translateY(100%) scale(0.9);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0) scale(1);
+  }
+}
+
+@keyframes toastOut {
+  from {
+    opacity: 1;
+    transform: translateY(0) scale(1);
+  }
+  to {
+    opacity: 0;
+    transform: translateY(100%) scale(0.9);
+  }
+}
+
+.toast {
+  animation: toastIn 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
+}
+
+.toast.leaving {
+  animation: toastOut 0.2s ease-in forwards;
+}
+```
+
+---
+
+## Performance Tips
+
+### Use Transform and Opacity
+
+These properties are GPU-accelerated and don't trigger layout:
+
+```css
+/* GOOD - GPU accelerated */
+@keyframes good {
+  from { transform: translateX(0); opacity: 0; }
+  to { transform: translateX(100px); opacity: 1; }
+}
+
+/* AVOID - Triggers layout recalculation */
+@keyframes avoid {
+  from { left: 0; width: 100px; }
+  to { left: 100px; width: 200px; }
+}
+```
+
+### Use will-change Sparingly
+
+```css
+.element {
+  will-change: transform, opacity;
+}
+
+/* Remove after animation */
+.element.animation-complete {
+  will-change: auto;
+}
+```
+
+### Respect Reduced Motion
+
+```css
+@keyframes fadeSlide {
+  from {
+    opacity: 0;
+    transform: translateY(20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.element {
+  animation: fadeSlide 0.3s ease-out;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .element {
+    animation: none;
+    /* Or use a simpler fade */
+    animation: fadeIn 0.1s ease-out;
+  }
+}
+```
+
+### Avoid Animating Layout Properties
+
+Properties that trigger layout (reflow):
+
+- `width`, `height`
+- `top`, `left`, `right`, `bottom`
+- `margin`, `padding`
+- `font-size`
+- `border-width`
+
+Use `transform: scale()` instead of `width/height` when possible.
+
+---
+
+## Debugging Animations
+
+### Browser DevTools
+
+1. **Chrome DevTools** → More Tools → Animations
+   - Pause, slow down, or step through animations
+   - Inspect timing curves
+
+2. **Firefox** → Inspector → Animations tab
+   - Visual timeline of all animations
+
+### Force Slow Motion
+
+```css
+/* Temporarily add to debug */
+* {
+  animation-duration: 3s !important;
+}
+```
+
+### Animation Events in JavaScript
+
+```typescript
+element.addEventListener('animationstart', (e) => {
+  console.log('Started:', e.animationName);
+});
+
+element.addEventListener('animationend', (e) => {
+  console.log('Ended:', e.animationName);
+  // Clean up class, remove element, etc.
+});
+
+element.addEventListener('animationiteration', (e) => {
+  console.log('Iteration:', e.animationName);
+});
+```
+
+### Common Issues
+
+| Problem | Solution |
+|---------|----------|
+| Animation not running | Check `animation-duration` is > 0 |
+| Element snaps back | Add `animation-fill-mode: forwards` |
+| Animation starts wrong | Use `animation-fill-mode: backwards` with delay |
+| Choppy animation | Use `transform` instead of layout properties |
+| Animation restarts on state change | Ensure Angular doesn't recreate the element |
+
+---
+
+## Quick Reference Card
+
+```css
+/* Basic setup */
+@keyframes name {
+  from { /* start */ }
+  to { /* end */ }
+}
+
+.element {
+  animation: name 0.3s ease-out forwards;
+}
+
+/* Angular 20+ */
+<div animate.enter="fade-in" animate.leave="fade-out">
+
+/* Shorthand order */
+animation: name duration timing delay count direction fill-mode state;
+
+/* Common timing functions */
+ease-out: cubic-bezier(0, 0, 0.58, 1)      /* Enter animations */
+ease-in: cubic-bezier(0.42, 0, 1, 1)       /* Exit animations */
+ease-in-out: cubic-bezier(0.42, 0, 0.58, 1) /* State changes */
+
+/* Fill modes */
+forwards  → Keep end state
+backwards → Apply start state during delay
+both      → Both of the above
+```
+
+---
+
+## Resources
+
+- [MDN CSS Animations Guide](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_animations/Using_CSS_animations)
+- [Angular Animation Migration Guide](https://angular.dev/guide/animations/migration)
+- [Cubic Bezier Tool](https://cubic-bezier.com)
+- [Easing Functions Cheat Sheet](https://easings.net)
+- [Josh W. Comeau's Keyframe Guide](https://www.joshwcomeau.com/animation/keyframe-animations/)

.claude/skills/git-workflow/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: git-workflow
-description: Enforces ISA-Frontend project Git workflow conventions including branch naming, conventional commits, and PR creation against develop branch
+description: This skill should be used when creating branches, writing commits, or creating pull requests. Enforces ISA-Frontend Git conventions including feature/task-id-name branch format, conventional commits without co-author tags, and PRs targeting develop branch.
 ---
 
 # Git Workflow Skill

.claude/skills/library-scaffolder/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: library-scaffolder
-description: This skill should be used when creating new Angular libraries in the ISA-Frontend monorepo. It handles Nx library generation with proper naming conventions, Vitest configuration with JUnit/Cobertura reporters, path alias setup, and validation. Use this skill when the user wants to create a new library, scaffold a feature/data-access/ui/util library, or requests "new library" creation.
+description: This skill should be used when creating feature/data-access/ui/util libraries or user says "create library", "new library", "scaffold library". Creates new Angular libraries in ISA-Frontend monorepo with proper Nx configuration, Vitest setup, architectural tags, and path aliases.
 ---
 
 # Library Scaffolder
@@ -51,6 +51,7 @@ npx nx generate @nx/angular:library \
   --name=[domain]-[layer]-[name] \
   --directory=libs/[domain]/[layer]/[name] \
   --importPath=@isa/[domain]/[layer]/[name] \
+  --prefix=[domain] \
   --style=css \
   --unitTestRunner=vitest \
   --standalone=true \
@@ -69,13 +70,53 @@ npx nx generate @nx/angular:library \
   --name=[domain]-[layer]-[name] \
   --directory=libs/[domain]/[layer]/[name] \
   --importPath=@isa/[domain]/[layer]/[name] \
+  --prefix=[domain] \
   --style=css \
   --unitTestRunner=vitest \
   --standalone=true \
   --skipTests=false
 ```
 
-### Step 4: Configure Vitest with JUnit and Cobertura
+### Step 4: Add Architectural Tags
+
+**CRITICAL**: Immediately after library generation, add proper tags to `project.json` for `@nx/enforce-module-boundaries`.
+
+Run the tagging script:
+```bash
+node scripts/add-library-tags.js
+```
+
+Or manually add tags to `libs/[domain]/[layer]/[name]/project.json`:
+
+```json
+{
+  "name": "[domain]-[layer]-[name]",
+  "tags": [
+    "scope:[domain]",
+    "type:[layer]"
+  ]
+}
+```
+
+**Tag Rules:**
+- **Scope tag**: `scope:[domain]` (e.g., `scope:oms`, `scope:crm`, `scope:ui`, `scope:shared`)
+- **Type tag**: `type:[layer]` (e.g., `type:feature`, `type:data-access`, `type:ui`, `type:util`)
+
+**Examples:**
+- `libs/oms/feature/return-search` → `["scope:oms", "type:feature"]`
+- `libs/ui/buttons` → `["scope:ui", "type:ui"]`
+- `libs/shared/scanner` → `["scope:shared", "type:shared"]`
+- `libs/core/auth` → `["scope:core", "type:core"]`
+
+**Verification:**
+```bash
+# Check tags were added
+cat libs/[domain]/[layer]/[name]/project.json | jq '.tags'
+
+# Should output: ["scope:[domain]", "type:[layer]"]
+```
+
+### Step 5: Configure Vitest with JUnit and Cobertura
 
 Update `libs/[path]/vite.config.mts`:
 
@@ -113,7 +154,7 @@ defineConfig(() => ({
 
 **Critical**: Adjust path depth based on library location.
 
-### Step 5: Verify Configuration
+### Step 6: Verify Configuration
 
 1. **Check Path Alias**
    - Verify `tsconfig.base.json` was updated
@@ -128,7 +169,7 @@ defineConfig(() => ({
    - JUnit XML: `testresults/junit-[library-name].xml`
    - Cobertura XML: `coverage/libs/[path]/cobertura-coverage.xml`
 
-### Step 6: Create Library README
+### Step 7: Create Library README
 
 Use `docs-researcher` to find similar library READMEs, then create comprehensive documentation including:
 - Overview and purpose
@@ -137,7 +178,7 @@ Use `docs-researcher` to find similar library READMEs, then create comprehensive
 - Usage examples
 - Testing information (Vitest + Angular Testing Utilities)
 
-### Step 7: Update Library Reference
+### Step 8: Update Library Reference
 
 Add entry to `docs/library-reference.md` under appropriate domain:
 
@@ -150,10 +191,10 @@ Add entry to `docs/library-reference.md` under appropriate domain:
 [Brief description]
 ```
 
-### Step 8: Run Full Validation
+### Step 9: Run Full Validation
 
 ```bash
-# Lint
+# Lint (includes boundary checks)
 npx nx lint [library-name]
 
 # Test with coverage
@@ -166,7 +207,7 @@ npx nx build [library-name]
 npx nx graph --focus=[library-name]
 ```
 
-### Step 9: Generate Creation Report
+### Step 10: Generate Creation Report
 
 ```
 Library Created Successfully
@@ -181,6 +222,7 @@ Import Alias: @isa/[domain]/[layer]/[name]
 Test Framework: Vitest with Angular Testing Utilities
 Style: CSS
 Standalone: Yes
+Tags: scope:[domain], type:[layer]
 JUnit Reporter: ✅ testresults/junit-[library-name].xml
 Cobertura Coverage: ✅ coverage/libs/[path]/cobertura-coverage.xml
 
@@ -193,12 +235,18 @@ import { Component } from '@isa/[domain]/[layer]/[name]';
 npx nx test [library-name] --skip-nx-cache
 npx nx test [library-name] --coverage.enabled=true --skip-nx-cache
 
+🏗️ Architecture Compliance
+--------------------------
+Tags enforce module boundaries via @nx/enforce-module-boundaries
+Run lint to check for violations: npx nx lint [library-name]
+
 📝 Next Steps
 -------------
 1. Develop library features
 2. Write tests using Vitest + Angular Testing Utilities
 3. Add E2E attributes (data-what, data-which) to templates
 4. Update README with usage examples
+5. Follow architecture rules (see eslint.config.js for constraints)
 ```
 
 ## Error Handling
@@ -220,4 +268,8 @@ npx nx test [library-name] --coverage.enabled=true --skip-nx-cache
 - docs/guidelines/testing.md (Vitest, JUnit, Cobertura sections)
 - docs/library-reference.md (domain patterns)
 - CLAUDE.md (Library Organization, Testing Framework sections)
+- eslint.config.js (@nx/enforce-module-boundaries configuration)
+- scripts/add-library-tags.js (automatic tagging script)
+- .claude/skills/architecture-enforcer (boundary validation)
 - Nx Angular Library Generator: https://nx.dev/nx-api/angular/generators/library
+- Nx Enforce Module Boundaries: https://nx.dev/nx-api/eslint-plugin/documents/enforce-module-boundaries

.claude/skills/ngrx-resource-api/SKILL.md

@@ -0,0 +1,287 @@
+---
+name: ngrx-resource-api
+description: This skill should be used when implementing Angular's Resource API with NgRx Signal Store for reactive data management. Use when creating signal stores that load data reactively, need automatic race condition prevention, or require declarative resource management without RxJS. Applies to data-access libraries, feature stores with API integration, and components needing reactive filtering or pagination.
+---
+
+# NgRx Resource API
+
+## Overview
+
+This skill enables integration of Angular's Resource API with NgRx Signal Store to create reactive data flows without RxJS while automatically preventing race conditions. The Resource API handles concurrent request management declaratively, eliminating manual `switchMap` or `takeUntilDestroyed` patterns.
+
+## Core Architectural Concepts
+
+### Reactive Flow Graph
+
+Establish three clear interaction points in the store:
+
+1. **Filter signals trigger resource loading** - Parameter changes automatically reload resources
+2. **Methods explicitly invoke operations** - Use `signalMethod` for user-triggered actions
+3. **Computed signals derive view models** - Transform loaded data for component consumption
+
+### The withProps Pattern for Dependency Injection
+
+Inject services via `withProps` with underscore-prefixed properties to mark them as internal implementation details:
+
+```typescript
+withProps(() => ({
+  _dataService: inject(DataService),
+  _notificationService: inject(ToastService),
+}))
+```
+
+**Benefits:**
+- Centralizes dependency injection in one location
+- Clear distinction between internal (prefixed) and public properties
+- Services available to all subsequent feature sections
+
+## Implementation Steps
+
+### Step 1: Inject Services with withProps
+
+Create the initial `withProps` section to inject required services:
+
+```typescript
+export const MyStore = signalStore(
+  withProps(() => ({
+    _dataService: inject(DataService),
+    _toastService: inject(ToastService),
+  })),
+  // ... additional features
+);
+```
+
+**Naming convention:** Prefix all injected services with underscore (`_`) to indicate internal use.
+
+### Step 2: Define Filter State
+
+Add state properties that will serve as resource parameters:
+
+```typescript
+withState({
+  filter: {
+    searchTerm: '',
+    category: '',
+  } as MyFilter,
+})
+```
+
+### Step 3: Configure Resources
+
+In a subsequent `withProps` section, create resources that reference the injected services and state:
+
+```typescript
+withProps((store) => ({
+  _itemsResource: resource({
+    params: store.filter,
+    loader: (loaderParams) => {
+      const filter = loaderParams.params;
+      const abortSignal = loaderParams.abortSignal;
+      return store._dataService.loadItems(filter, abortSignal);
+    }
+  })
+}))
+```
+
+**Key points:**
+- Resources automatically reload when `params` signal changes
+- `abortSignal` enables automatic cancellation of in-flight requests
+- Loader must return a Promise (use `.findPromise()` if service returns Observable)
+
+### Step 4: Expose Read-Only Resources (Optional)
+
+If the resource should be accessible to consumers, expose it as read-only:
+
+```typescript
+withProps((store) => ({
+  itemsResource: store._itemsResource.asReadonly(),
+}))
+```
+
+**Pattern:** Internal resources use underscore prefix, public versions are read-only without prefix.
+
+### Step 5: Create Signal Methods for Updates
+
+Use `signalMethod` for actions that update state and trigger resource reloads:
+
+```typescript
+withMethods((store) => ({
+  updateFilter: signalMethod<MyFilter>((filter) => {
+    patchState(store, { filter });
+  }),
+
+  refresh: () => {
+    store._itemsResource.reload();
+  }
+}))
+```
+
+**Important:** `signalMethod` implementations are **untracked by convention** - they don't re-execute when signals change. This provides explicit control flow.
+
+### Step 6: Add Error Handling
+
+Use `withHooks` to react to resource errors:
+
+```typescript
+withHooks({
+  onInit: (store) => {
+    effect(() => {
+      const error = store._itemsResource.error();
+      if (error) {
+        store._toastService.show('Error: ' + getMessage(error));
+      }
+    });
+  }
+})
+```
+
+**Pattern:** Error effects should be read-only - they observe errors and trigger side effects, but don't modify state.
+
+## Common Patterns
+
+### Template Integration with linkedSignal
+
+For two-way form binding that synchronizes with the store:
+
+```typescript
+export class MyComponent {
+  #store = inject(MyStore);
+
+  // Create linked signal for form field
+  searchTerm = linkedSignal(() => this.#store.filter().searchTerm);
+
+  // Combine form fields into filter object
+  #linkedFilter = computed(() => ({
+    searchTerm: this.searchTerm(),
+    // ... other fields
+  }));
+
+  constructor() {
+    // Sync form changes back to store
+    this.#store.updateFilter(this.#linkedFilter);
+  }
+}
+```
+
+**Benefits:**
+- Two-way binding for forms
+- Automatic store synchronization
+- Type-safe filter construction
+
+### Working with Resource Data
+
+Access resource data through resource signals:
+
+```typescript
+withComputed((store) => ({
+  items: computed(() => store._itemsResource.value() ?? []),
+  isLoading: computed(() => store._itemsResource.isLoading()),
+  hasError: computed(() => store._itemsResource.hasError()),
+}))
+```
+
+**Available signals:**
+- `value()` - The loaded data (undefined while loading)
+- `isLoading()` - Loading state boolean
+- `hasError()` - Error state boolean
+- `error()` - Error object if present
+- `status()` - Overall status: 'idle' | 'loading' | 'resolved' | 'error'
+
+### Updating Resource Data Locally
+
+For temporary working copies before server writes:
+
+```typescript
+withMethods((store) => ({
+  updateLocalItem: (id: string, changes: Partial<Item>) => {
+    store._itemsResource.update((currentItems) => {
+      return currentItems.map(item =>
+        item.id === id ? { ...item, ...changes } : item
+      );
+    });
+  }
+}))
+```
+
+**Note:** This pattern feels unconventional but aligns with maintaining temporary working copies before server persistence.
+
+### Multiple Resources in One Store
+
+Combine multiple resources for complex data requirements:
+
+```typescript
+withProps((store) => ({
+  _itemsResource: resource({
+    params: store.filter,
+    loader: (params) => store._dataService.loadItems(params.params, params.abortSignal)
+  }),
+
+  _detailsResource: resource({
+    params: store.selectedId,
+    loader: (params) => {
+      if (!params.params) return Promise.resolve(null);
+      return store._dataService.loadDetails(params.params, params.abortSignal);
+    }
+  })
+}))
+```
+
+**Pattern:** Each resource has independent params and loading state, but can share service instances.
+
+## Important Considerations
+
+### Race Condition Prevention
+
+The Resource API automatically handles race conditions:
+- New requests automatically cancel pending requests
+- No need for `switchMap`, `takeUntilDestroyed`, or manual abort handling
+- Declarative parameter changes trigger clean cancellation
+
+### Untracked Signal Methods
+
+`signalMethod` implementations deliberately skip reactive tracking:
+- Provides explicit, predictable control flow
+- Prevents unexpected re-executions from signal changes
+- Makes side effects obvious at call sites
+
+### Loader Function Requirements
+
+Loaders must:
+- Return a `Promise` (not Observable)
+- Accept and pass through the `abortSignal` to enable cancellation
+- Handle the signal in the underlying HTTP call
+
+**Converting Observables:**
+```typescript
+loader: (params) => {
+  return firstValueFrom(
+    this._service.load$(params.params)
+      .pipe(takeUntilDestroyed(this._destroyRef))
+  );
+}
+```
+
+### Resource Lifecycle
+
+Resources maintain their own state machine:
+1. **Idle** - Initial state before first load
+2. **Loading** - Request in progress
+3. **Resolved** - Data loaded successfully
+4. **Error** - Request failed
+
+State transitions automatically trigger reactive updates to dependent computeds and effects.
+
+## When to Use This Pattern
+
+**Use Resource API with Signal Store when:**
+- Loading data based on reactive filter/search parameters
+- Need automatic race condition handling for concurrent requests
+- Want declarative data loading without RxJS subscriptions
+- Building stores with frequently changing query parameters
+- Implementing pagination, filtering, or search features
+
+**Consider alternatives when:**
+- Simple one-time data loads (use `rxMethod` or direct service calls)
+- Complex Observable chains with multiple operators needed
+- Need fine-grained control over request timing/caching
+- Working with WebSocket or SSE streams (use `rxMethod` instead)

.mcp.json

@@ -1,22 +1,17 @@
-{
-  "mcpServers": {
-    "context7": {
-      "type": "http",
-      "url": "https://mcp.context7.com/mcp"
-    },
-    "nx-mcp": {
-      "type": "stdio",
-      "command": "npx",
-      "args": ["nx-mcp@latest"]
-    },
-    "angular-mcp": {
-      "type": "stdio",
-      "command": "npx",
-      "args": ["@angular/cli", "mcp"]
-    },
-    "figma-desktop": {
-      "type": "http",
-      "url": "http://127.0.0.1:3845/mcp"
-    }
-  }
-}
+{
+  "mcpServers": {
+    "context7": {
+      "type": "http",
+      "url": "https://mcp.context7.com/mcp"
+    },
+    "angular-mcp": {
+      "type": "stdio",
+      "command": "npx",
+      "args": ["@angular/cli", "mcp"]
+    },
+    "figma-desktop": {
+      "type": "http",
+      "url": "http://127.0.0.1:3845/mcp"
+    }
+  }
+}

AGENTS.md

@@ -0,0 +1,13 @@
+<!-- nx configuration start-->
+<!-- Leave the start & end comments to automatically receive updates. -->
+
+# General Guidelines for working with Nx
+
+- When running tasks (build, lint, test, e2e, etc.), always use the Nx CLI (`nx run`, `nx run-many`, `nx affected`) instead of underlying tooling directly
+- Use `npx nx show projects` to list all projects in the workspace
+- Use `npx nx show project <name>` to analyze specific project structure and dependencies
+- Use `npx nx graph` to visualize project dependencies
+- For Nx documentation, use Context7 or WebSearch to find up-to-date docs
+- If the user needs help with an Nx configuration or project graph error, run `npx nx report` for diagnostic info
+
+<!-- nx configuration end-->

CLAUDE.md

@@ -2,37 +2,128 @@
 
 This file contains meta-instructions for how Claude should work with the ISA-Frontend codebase.
 
-## 🔴 CRITICAL: Mandatory Agent Usage
+## 🔴 CRITICAL: You Are an LLM with Outdated Knowledge
 
-**You MUST use these subagents for ALL research and knowledge management tasks:**
-- **`docs-researcher`**: For ALL documentation (packages, libraries, READMEs)
-- **`docs-researcher-advanced`**: Auto-escalate when docs-researcher fails
-- **`Explore`**: For ALL code pattern searches and multi-file analysis
+**Your training data is outdated. NEVER assume you know current APIs.**
 
-**Violations of this rule degrade performance and context quality. NO EXCEPTIONS.**
+- Libraries, frameworks, and APIs change constantly
+- Your memory of APIs is unreliable
+- Current documentation is the ONLY source of truth
+
+**ALWAYS use research agents PROACTIVELY - without user asking.**
+
+## 🔴 CRITICAL: Proactive Agent & Skill Usage
+
+**You MUST use agents and skills AUTOMATICALLY for ALL tasks - do NOT wait for user to tell you.**
+
+### Research Agents (Use BEFORE Implementation)
+
+| Agent | Auto-Invoke When | User Interaction |
+|-------|------------------|------------------|
+| `docs-researcher` | ANY external library/API usage | NONE - just do it |
+| `docs-researcher-advanced` | Implementation fails OR docs-researcher insufficient | NONE - just do it |
+| `Explore` | Need codebase patterns or multi-file analysis | NONE - just do it |
+
+**Research-First Flow (Mandatory):**
+```
+Task involves external API? → AUTO-INVOKE docs-researcher
+                              ↓
+                              Implement based on docs
+                              ↓
+                              Failed? → AUTO-INVOKE docs-researcher-advanced
+                              ↓
+                              Still failed? → ASK USER for guidance
+```
+
+### Skills (Use DURING Implementation)
+
+| Trigger | Auto-Invoke Skill |
+|---------|-------------------|
+| Writing Angular templates | `angular-template` |
+| Writing HTML with interactivity | `html-template` |
+| Applying Tailwind classes | `tailwind` |
+| Writing any Angular code | `logging` |
+| Creating CSS animations | `css-keyframes-animations` |
+| Creating new library | `library-scaffolder` |
+| Regenerating API clients | `swagger-sync-manager` |
+| Git operations | `git-workflow` |
+
+**Skill chaining for Angular work:**
+```
+angular-template → html-template → logging → tailwind
+```
+
+### Implementation Agents (Use for Complex Tasks)
+
+| Agent | Auto-Invoke When |
+|-------|------------------|
+| `angular-developer` | Creating components, services, stores (2-5 files) |
+| `test-writer` | Writing tests, adding coverage |
+| `refactor-engineer` | Refactoring 5+ files, migrations |
+
+### Anti-Patterns (FORBIDDEN)
+
+```
+❌ Implementing without researching first
+❌ Asking "should I research this?" - just do it
+❌ Asking "should I use a skill?" - just do it
+❌ Trial and error: implement → fail → try again → fail
+❌ Writing Angular code without loading skills first
+```
+
+### Correct Pattern
+
+```
+✅ "Researching [library] API..." → [auto-invokes docs-researcher]
+✅ "Loading angular-template skill..." → [auto-invokes skill]
+✅ "Implementing based on current docs..."
+✅ If fails: "Escalating research..." → [auto-invokes docs-researcher-advanced]
+```
 
 ## Communication Guidelines
 
-**Keep answers concise and focused:**
-- Provide direct, actionable responses without unnecessary elaboration
-- Skip verbose explanations unless specifically requested
-- Focus on what the user needs to know, not everything you know
-- Use bullet points and structured formatting for clarity
-- Only provide detailed explanations when complexity requires it
+- Keep answers concise and focused
+- Use bullet points and structured formatting
+- Skip verbose explanations unless requested
+- Focus on what the user needs, not everything you know
 
-## Researching and Investigating the Codebase
+## Context Management
 
-**🔴 MANDATORY: You MUST use subagents for research. Direct file reading/searching.**
+**Context bloat kills reliability. Minimize aggressively.**
 
-### Required Agent Usage
+### Tool Result Minimization
 
-| Task Type | Required Agent | Escalation Path |
-|-----------|---------------|-----------------|
-| **Package/Library Documentation** | `docs-researcher` | → `docs-researcher-advanced` if not found |
-| **Internal Library READMEs** | `docs-researcher` | Keep context clean |
-| **Code Pattern Search** | `Explore` | Set thoroughness level |
-| **Implementation Analysis** | `Explore` | Multiple file analysis |
-| **Single Specific File** | Read tool directly | No agent needed |
+| Tool | Keep | Discard |
+|------|------|---------|
+| Bash (success) | `✓ Command succeeded` | Full output |
+| Bash (failure) | Exit code + error (max 10 lines) | Verbose output |
+| Edit | `✓ Modified file.ts` | Full diffs |
+| Read | Extracted relevant section | Full file content |
+| Agent results | 1-2 sentence summary | Raw JSON/full output |
+
+### Agent Result Handling
+
+```
+❌ WRONG: "Docs researcher returned: [huge JSON...]"
+✅ RIGHT: "docs-researcher found: Use signalStore() with withState()"
+```
+
+### Session Cleanup
+
+Use `/clear` between unrelated tasks to prevent context degradation.
+
+## Implementation Decisions
+
+| Task Type                         | Required Agent     | Escalation Path                           |
+| --------------------------------- | ------------------ | ----------------------------------------- |
+| **Package/Library Documentation** | `docs-researcher`  | → `docs-researcher-advanced` if not found |
+| **Internal Library READMEs**      | `docs-researcher`  | Keep context clean                        |
+| **Monorepo Library Overview**     | `docs-researcher`  | Uses `docs/library-reference.md`          |
+| **Code Pattern Search**           | `Explore`          | Set thoroughness level                    |
+| **Implementation Analysis**       | `Explore`          | Multiple file analysis                    |
+| **Single Specific File**          | Read tool directly | No agent needed                           |
+
+**Note:** The `docs-researcher` agent uses `docs/library-reference.md` as a primary index for discovering monorepo libraries. This file contains descriptions and locations for all libraries, enabling quick library discovery without reading individual READMEs.
 
 ### Documentation Research System (Two-Tier)
 
@@ -43,17 +134,60 @@ This file contains meta-instructions for how Claude should work with the ISA-Fro
    - Need code inference
    - Complex architectural questions
 
-### Enforcement Examples
+### When to Use Agents vs Direct Tools
 
 ```
-❌ WRONG: Read libs/ui/buttons/README.md
-✅ RIGHT: Task → docs-researcher → "Find documentation for @isa/ui/buttons"
-
-❌ WRONG: Grep for "signalStore" patterns
-✅ RIGHT: Task → Explore → "Find all signalStore implementations"
-
-❌ WRONG: WebSearch for Zod documentation
-✅ RIGHT: Task → docs-researcher → "Find Zod validation documentation"
+Single known file? → Read tool directly
+Code pattern search? → Explore agent
+Documentation lookup? → docs-researcher agent
+Creating 2-5 Angular files? → angular-developer agent
+Refactoring 5+ files? → refactor-engineer agent
+Simple 1-file edit? → Direct implementation
 ```
 
-**Remember: Using subagents is NOT optional - it's mandatory for maintaining context efficiency and search quality.**
+### Proactive Agent Triggers
+
+**Auto-invoke `angular-developer` when user says:**
+- "Create component/service/store/pipe/directive/guard"
+- Task touches 2-5 Angular files
+
+**Auto-invoke `test-writer` when user says:**
+- "Write tests", "Add coverage"
+
+**Auto-invoke `refactor-engineer` when user says:**
+- "Refactor all", "Migrate X files", "Update pattern across"
+
+**Auto-invoke `context-manager` when user says:**
+- "Remember to", "TODO:", "Don't forget"
+
+## Agent Communication
+
+### Briefing Agents
+
+Keep briefings focused:
+```
+Implement: [type] at [path]
+Purpose: [1 sentence]
+Requirements: [list]
+```
+
+### Agent Results
+
+Extract only what's needed, discard the rest:
+```
+✓ Created 3 files
+✓ Tests: 12/12 passing
+✓ Skills applied: angular-template, logging
+```
+
+<!-- nx configuration start-->
+<!-- Leave the start & end comments to automatically receive updates. -->
+
+# General Guidelines for working with Nx
+
+- Run tasks through `nx` CLI (`nx run`, `nx run-many`, `nx affected`) instead of underlying tooling
+- Use `npx nx show projects` to list all projects in the workspace
+- Use `npx nx show project <name>` to analyze specific project structure and dependencies
+- Use `npx nx graph` to visualize project dependencies
+
+<!-- nx configuration end-->

apps/isa-app/project.json

@@ -1,162 +1,162 @@
-{
-  "name": "isa-app",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "projectType": "application",
-  "prefix": "app",
-  "sourceRoot": "apps/isa-app/src",
-  "tags": [],
-  "targets": {
-    "build": {
-      "executor": "@angular-devkit/build-angular:application",
-      "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",
-        "browser": "apps/isa-app/src/main.ts",
-        "polyfills": ["zone.js"],
-        "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": [
-          "@angular/cdk/overlay-prebuilt.css",
-          "apps/isa-app/src/tailwind.scss",
-          "apps/isa-app/src/styles.scss"
-        ],
-        "scripts": []
-      },
-      "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",
-          "serviceWorker": "apps/isa-app/ngsw-config.json"
-        },
-        "development": {
-          "optimization": false,
-          "extractLicenses": false,
-          "sourceMap": 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",
-      "continuous": true
-    },
-    "extract-i18n": {
-      "executor": "@angular-devkit/build-angular:extract-i18n",
-      "options": {
-        "buildTarget": "isa-app:build"
-      }
-    },
-    "lint": {
-      "executor": "@nx/eslint:lint"
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
-      "options": {
-        "jestConfig": "apps/isa-app/jest.config.ts"
-      }
-    },
-    "serve-static": {
-      "executor": "@nx/web:file-server",
-      "options": {
-        "buildTarget": "isa-app:build",
-        "staticFilePath": "dist/apps/isa-app/browser",
-        "spa": true
-      }
-    },
-    "storybook": {
-      "executor": "@storybook/angular:start-storybook",
-      "options": {
-        "port": 4400,
-        "configDir": "apps/isa-app/.storybook",
-        "browserTarget": "isa-app:build",
-        "compodoc": false,
-        "open": false,
-        "assets": [
-          {
-            "glob": "**/*",
-            "input": "apps/isa-app/src/assets",
-            "output": "/assets"
-          }
-        ],
-        "styles": [
-          "@angular/cdk/overlay-prebuilt.css",
-          "apps/isa-app/src/tailwind.scss",
-          "apps/isa-app/src/styles.scss"
-        ]
-      },
-      "configurations": {
-        "ci": {
-          "quiet": true
-        }
-      }
-    },
-    "build-storybook": {
-      "executor": "@storybook/angular:build-storybook",
-      "outputs": ["{options.outputDir}"],
-      "options": {
-        "outputDir": "dist/storybook/isa-app",
-        "configDir": "apps/isa-app/.storybook",
-        "browserTarget": "isa-app:build",
-        "compodoc": false,
-        "styles": [
-          "@angular/cdk/overlay-prebuilt.css",
-          "apps/isa-app/src/tailwind.scss",
-          "apps/isa-app/src/styles.scss"
-        ]
-      },
-      "configurations": {
-        "ci": {
-          "quiet": true
-        }
-      }
-    }
-  }
-}
+{
+  "name": "isa-app",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "application",
+  "prefix": "app",
+  "sourceRoot": "apps/isa-app/src",
+  "tags": ["skip:ci", "scope:app", "type:app"],
+  "targets": {
+    "build": {
+      "executor": "@angular-devkit/build-angular:application",
+      "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",
+        "browser": "apps/isa-app/src/main.ts",
+        "polyfills": ["zone.js"],
+        "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": [
+          "@angular/cdk/overlay-prebuilt.css",
+          "apps/isa-app/src/tailwind.scss",
+          "apps/isa-app/src/styles.scss"
+        ],
+        "scripts": []
+      },
+      "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",
+          "serviceWorker": "apps/isa-app/ngsw-config.json"
+        },
+        "development": {
+          "optimization": false,
+          "extractLicenses": false,
+          "sourceMap": 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",
+      "continuous": true
+    },
+    "extract-i18n": {
+      "executor": "@angular-devkit/build-angular:extract-i18n",
+      "options": {
+        "buildTarget": "isa-app:build"
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "apps/isa-app/jest.config.ts"
+      }
+    },
+    "serve-static": {
+      "executor": "@nx/web:file-server",
+      "options": {
+        "buildTarget": "isa-app:build",
+        "staticFilePath": "dist/apps/isa-app/browser",
+        "spa": true
+      }
+    },
+    "storybook": {
+      "executor": "@storybook/angular:start-storybook",
+      "options": {
+        "port": 4400,
+        "configDir": "apps/isa-app/.storybook",
+        "browserTarget": "isa-app:build",
+        "compodoc": false,
+        "open": false,
+        "assets": [
+          {
+            "glob": "**/*",
+            "input": "apps/isa-app/src/assets",
+            "output": "/assets"
+          }
+        ],
+        "styles": [
+          "@angular/cdk/overlay-prebuilt.css",
+          "apps/isa-app/src/tailwind.scss",
+          "apps/isa-app/src/styles.scss"
+        ]
+      },
+      "configurations": {
+        "ci": {
+          "quiet": true
+        }
+      }
+    },
+    "build-storybook": {
+      "executor": "@storybook/angular:build-storybook",
+      "outputs": ["{options.outputDir}"],
+      "options": {
+        "outputDir": "dist/storybook/isa-app",
+        "configDir": "apps/isa-app/.storybook",
+        "browserTarget": "isa-app:build",
+        "compodoc": false,
+        "styles": [
+          "@angular/cdk/overlay-prebuilt.css",
+          "apps/isa-app/src/tailwind.scss",
+          "apps/isa-app/src/styles.scss"
+        ]
+      },
+      "configurations": {
+        "ci": {
+          "quiet": true
+        }
+      }
+    }
+  }
+}

apps/isa-app/src/app/app-routing.module.ts

@@ -29,7 +29,11 @@ import {
   ActivateProcessIdWithConfigKeyGuard,
 } from './guards/activate-process-id.guard';
 import { MatomoRouteData } from 'ngx-matomo-client';
-import { tabResolverFn, processResolverFn } from '@isa/core/tabs';
+import {
+  tabResolverFn,
+  processResolverFn,
+  hasTabIdGuard,
+} from '@isa/core/tabs';
 import { provideScrollPositionRestoration } from '@isa/utils/scroll-position';
 
 const routes: Routes = [
@@ -182,7 +186,7 @@ const routes: Routes = [
     path: ':tabId',
     component: MainComponent,
     resolve: { process: processResolverFn, tab: tabResolverFn },
-    canActivate: [IsAuthenticatedGuard],
+    canActivate: [IsAuthenticatedGuard, hasTabIdGuard],
     children: [
       {
         path: 'reward',

apps/isa-app/src/app/app.module.ts

@@ -68,7 +68,7 @@ import {
   matWifiOff,
 } from '@ng-icons/material-icons/baseline';
 import { NetworkStatusService } from './services/network-status.service';
-import { debounceTime, firstValueFrom } from 'rxjs';
+import { debounceTime, filter, firstValueFrom, switchMap } from 'rxjs';
 import { provideMatomo } from 'ngx-matomo-client';
 import { withRouter, withRouteData } from 'ngx-matomo-client';
 import {
@@ -77,7 +77,7 @@ import {
   LogLevel,
   withSink,
   ConsoleLogSink,
-  logger,
+  logger as loggerFactory,
 } from '@isa/core/logging';
 import {
   IDBStorageProvider,
@@ -85,57 +85,77 @@ import {
   UserStorageProvider,
 } from '@isa/core/storage';
 import { Store } from '@ngrx/store';
-import { TabNavigationService } from '@isa/core/tabs';
 import { OAuthService } from 'angular-oauth2-oidc';
 import z from 'zod';
+import { TabNavigationService } from '@isa/core/tabs';
 
 registerLocaleData(localeDe, localeDeExtra);
 registerLocaleData(localeDe, 'de', localeDeExtra);
 
 export function _appInitializerFactory(config: Config, injector: Injector) {
   return async () => {
+    // Get logging service for initialization logging
+    const logger = loggerFactory(() => ({ service: 'AppInitializer' }));
     const statusElement = document.querySelector('#init-status');
     const laoderElement = document.querySelector('#init-loader');
 
     try {
+      logger.info('Starting application initialization');
+
       let online = false;
       const networkStatus = injector.get(NetworkStatusService);
       while (!online) {
         online = await firstValueFrom(networkStatus.online$);
 
         if (!online) {
+          logger.warn('Waiting for network connection');
           statusElement.innerHTML =
             '<b>Warte auf Netzwerkverbindung (WLAN)</b><br><br>Bitte prüfen Sie die Netzwerkverbindung (WLAN).<br>Sobald eine Netzwerkverbindung besteht, wird die App automatisch neu geladen.';
           await new Promise((resolve) => setTimeout(resolve, 250));
         }
       }
 
+      logger.info('Network connection established');
+
       statusElement.innerHTML = 'Konfigurationen werden geladen...';
+      logger.info('Loading configurations');
 
       statusElement.innerHTML = 'Scanner wird initialisiert...';
+      logger.info('Initializing scanner');
       const scanAdapter = injector.get(ScanAdapterService);
       await scanAdapter.init();
+      logger.info('Scanner initialized');
 
       statusElement.innerHTML = 'Authentifizierung wird geprüft...';
+      logger.info('Initializing authentication');
 
       const auth = injector.get(AuthService);
       try {
-        await auth.init();
+        const authenticated = await auth.init();
+        if (!authenticated) {
+          throw new Error('User is not authenticated');
+        }
       } catch {
         statusElement.innerHTML = 'Authentifizierung wird durchgeführt...';
+        logger.info('Performing login');
         const strategy = injector.get(LoginStrategy);
         await strategy.login();
         return;
       }
 
       statusElement.innerHTML = 'Native Container wird initialisiert...';
+      logger.info('Initializing native container');
       const nativeContainer = injector.get(NativeContainerService);
       await nativeContainer.init();
+      logger.info('Native container initialized');
 
       statusElement.innerHTML = 'Datenbank wird initialisiert...';
+      logger.info('Initializing database');
       await injector.get(IDBStorageProvider).init();
+      logger.info('Database initialized');
 
       statusElement.innerHTML = 'Benutzerzustand wird geladen...';
+      logger.info('Loading user storage');
       const userStorage = injector.get(UserStorageProvider);
       await userStorage.init();
 
@@ -144,16 +164,29 @@ export function _appInitializerFactory(config: Config, injector: Injector) {
       const state = userStorage.get('store');
       if (state && state['version'] === version) {
         store.dispatch({ type: 'HYDRATE', payload: userStorage.get('store') });
+        logger.info('Store hydrated from user storage');
+      } else {
+        logger.debug('Store hydration skipped', () => ({
+          reason: state ? 'version mismatch' : 'no stored state',
+        }));
       }
       // Subscribe on Store changes and save to user storage
-      store.pipe(debounceTime(1000)).subscribe((state) => {
-        userStorage.set('store', { ...state, version });
-      });
+      auth.initialized$
+        .pipe(
+          filter((initialized) => initialized),
+          switchMap(() => store.pipe(debounceTime(1000))),
+        )
+        .subscribe((state) => {
+          userStorage.set('store', state);
+        });
 
+      logger.info('Application initialization completed');
       // Inject tab navigation service to initialize it
       injector.get(TabNavigationService).init();
     } catch (error) {
-      console.error('Error during app initialization', error);
+      logger.error('Application initialization failed', error as Error, () => ({
+        message: (error as Error).message,
+      }));
       laoderElement.remove();
       statusElement.classList.add('text-xl');
       statusElement.innerHTML +=
@@ -199,7 +232,7 @@ export function _notificationsHubOptionsFactory(
 }
 
 const USER_SUB_FACTORY = () => {
-  const _logger = logger(() => ({
+  const _logger = loggerFactory(() => ({
     context: 'USER_SUB',
   }));
   const auth = inject(OAuthService);

apps/isa-app/src/app/interceptors/http-error.interceptor.ts

@@ -8,24 +8,25 @@ import {
 } from '@angular/common/http';
 import { from, NEVER, Observable, throwError } from 'rxjs';
 import { catchError, filter, mergeMap, takeUntil } from 'rxjs/operators';
-import { LoginStrategy } from '@core/auth';
-import { IsaLogProvider } from '../providers';
-import { LogLevel } from '@core/logger';
+import { AuthService, LoginStrategy } from '@core/auth';
 import { injectOnline$ } from '../services/network-status.service';
+import { logger } from '@isa/core/logging';
 
 @Injectable()
 export class HttpErrorInterceptor implements HttpInterceptor {
-  readonly offline$ = injectOnline$().pipe(filter((online) => !online));
-  readonly injector = inject(Injector);
-
-  constructor(private _isaLogProvider: IsaLogProvider) {}
+  #logger = logger(() => ({
+    'http-interceptor': 'HttpErrorInterceptor',
+  }));
+  #offline$ = injectOnline$().pipe(filter((online) => !online));
+  #injector = inject(Injector);
+  #auth = inject(AuthService);
 
   intercept(
     req: HttpRequest<any>,
     next: HttpHandler,
   ): Observable<HttpEvent<any>> {
     return next.handle(req).pipe(
-      takeUntil(this.offline$),
+      takeUntil(this.#offline$),
       catchError((error: HttpErrorResponse, caught: any) =>
         this.handleError(error),
       ),
@@ -33,18 +34,22 @@ export class HttpErrorInterceptor implements HttpInterceptor {
   }
 
   handleError(error: HttpErrorResponse): Observable<any> {
-    if (error.status === 401) {
-      const strategy = this.injector.get(LoginStrategy);
+    return this.#auth.initialized$.pipe(
+      mergeMap((initialized) => {
+        if (initialized && error.status === 401) {
+          const strategy = this.#injector.get(LoginStrategy);
 
-      return from(strategy.login('Sie sind nicht mehr angemeldet')).pipe(
-        mergeMap(() => NEVER),
-      );
-    }
+          return from(strategy.login('Sie sind nicht mehr angemeldet')).pipe(
+            mergeMap(() => NEVER),
+          );
+        }
 
-    if (!error.url.endsWith('/isa/logging')) {
-      this._isaLogProvider.log(LogLevel.ERROR, 'Http Error', error);
-    }
+        if (!error.url.endsWith('/isa/logging')) {
+          this.#logger.error('Http Error', error);
+        }
 
-    return throwError(error);
+        return throwError(() => error);
+      }),
+    );
   }
 }

apps/isa-app/src/config/config.feature.json

@@ -1,85 +1,85 @@
-{
-  "title": "ISA - Feature",
-  "silentRefresh": {
-    "interval": 300000
-  },
-  "@cdn/product-image": {
-    "url": "https://produktbilder.paragon-data.net"
-  },
-  "@core/auth": {
-    "issuer": "https://sso-test.paragon-data.de",
-    "clientId": "hug-isa",
-    "responseType": "id_token token",
-    "oidc": true,
-    "scope": "openid profile cmf_user isa-isa-webapi isa-checkout-webapi isa-cat-webapi isa-ava-webapi isa-crm-webapi isa-review-webapi isa-kpi-webapi isa-oms-webapi isa-nbo-webapi isa-print-webapi eis-service isa-inv-webapi isa-wws-webapi"
-  },
-  "@core/logger": {
-    "logLevel": "debug"
-  },
-  "@domain/checkout": {
-    "olaExpiration": "5m"
-  },
-  "@swagger/isa": {
-    "rootUrl": "https://isa-feature.paragon-data.net/isa/v1"
-  },
-  "@swagger/cat": {
-    "rootUrl": "https://isa-test.paragon-data.net/catsearch/v6"
-  },
-  "@swagger/av": {
-    "rootUrl": "https://isa-test.paragon-data.net/ava/v6"
-  },
-  "@swagger/checkout": {
-    "rootUrl": "https://isa-feature.paragon-data.net/checkout/v6"
-  },
-  "@swagger/crm": {
-    "rootUrl": "https://isa-feature.paragon-data.net/crm/v6"
-  },
-  "@swagger/oms": {
-    "rootUrl": "https://isa-feature.paragon-data.net/oms/v6"
-  },
-  "@swagger/print": {
-    "rootUrl": "https://isa-feature.paragon-data.net/print/v1"
-  },
-  "@swagger/eis": {
-    "rootUrl": "https://filialinformationsystem-test.paragon-systems.de/eiswebapi/v1"
-  },
-  "@swagger/remi": {
-    "rootUrl": "https://isa-feature.paragon-data.net/inv/v6"
-  },
-  "@swagger/wws": {
-    "rootUrl": "https://isa-test.paragon-data.net/wws/v1"
-  },
-  "hubs": {
-    "notifications": {
-      "url": "https://isa-feature.paragon-data.net/isa/v1/rt",
-      "enableAutomaticReconnect": false,
-      "httpOptions": {
-        "transport": 1,
-        "logMessageContent": true,
-        "skipNegotiation": true
-      }
-    }
-  },
-  "process": {
-    "ids": {
-      "goodsOut": 1000,
-      "goodsIn": 2000,
-      "taskCalendar": 3000,
-      "remission": 4000,
-      "packageInspection": 5000,
-      "assortment": 6000,
-      "pickupShelf": 7000
-    }
-  },
-  "checkForUpdates": 3600000,
-  "licence": {
-    "scandit": "Ae8F2Wx2RMq5Lvn7UUAlWzVFZTt2+ubMAF8XtDpmPlNkBeG/LWs1M7AbgDW0LQqYLnszClEENaEHS56/6Ts2vrJ1Ux03CXUjK3jUvZpF5OchXR1CpnmpepJ6WxPCd7LMVHUGG1BbwPLDTFjP3y8uT0caTSmmGrYQWAs4CZcEF+ZBabP0z7vfm+hCZF/ebj9qqCJZcW8nH/n19hohshllzYBjFXjh87P2lIh1s6yZS3OaQWWXo/o0AKdxx7T6CVyR0/G5zq6uYJWf6rs3euUBEhpzOZHbHZK86Lvy2AVBEyVkkcttlDW1J2fA4l1W1JV/Xibz8AQV6kG482EpGF42KEoK48paZgX3e1AQsqUtmqzw294dcP4zMVstnw5/WrwKKi/5E/nOOJT2txYP1ZufIjPrwNFsqTlv7xCQlHjMzFGYwT816yD5qLRLbwOtjrkUPXNZLZ06T4upvWwJDmm8XgdeoDqMjHdcO4lwji1bl9EiIYJ/2qnsk9yZ2FqSaHzn4cbiL0f5u2HFlNAP0GUujGRlthGhHi6o4dFU+WAxKsFMKVt+SfoQUazNKHFVQgiAklTIZxIc/HUVzRvOLMxf+wFDerraBtcqGJg+g/5mrWYqeDBGhCBHtKiYf6244IJ4afzNTiH1/30SJcRzXwbEa3A7q1fJTx9/nLTOfVPrJKBQs7f/OQs2dA7LDCel8mzXdbjvsNQaeU5+iCIAq6zbTNKy1xT8wwj+VZrQmtNJs+qeznD+u29nCM24h8xCmRpvNPo4/Mww/lrTNrrNwLBSn1pMIwsH7yS9hH0v0oNAM3A6bVtk1D9qEkbyw+xZa+MZGpMP0D0CdcsqHalPcm5r/Ik="
-  },
-  "gender": {
-    "0": "Keine Anrede",
-    "1": "Enby",
-    "2": "Herr",
-    "4": "Frau"
-  },
-  "@shared/icon": "/assets/icons.json"
-}
+{
+  "title": "ISA - Feature",
+  "silentRefresh": {
+    "interval": 300000
+  },
+  "@cdn/product-image": {
+    "url": "https://produktbilder.paragon-data.net"
+  },
+  "@core/auth": {
+    "issuer": "https://sso-test.paragon-data.de",
+    "clientId": "hug-isa",
+    "responseType": "id_token token",
+    "oidc": true,
+    "scope": "openid profile cmf_user isa-isa-webapi isa-checkout-webapi isa-cat-webapi isa-ava-webapi isa-crm-webapi isa-review-webapi isa-kpi-webapi isa-oms-webapi isa-nbo-webapi isa-print-webapi eis-service isa-inv-webapi isa-wws-webapi"
+  },
+  "@core/logger": {
+    "logLevel": "debug"
+  },
+  "@domain/checkout": {
+    "olaExpiration": "5m"
+  },
+  "@swagger/isa": {
+    "rootUrl": "https://isa-test.paragon-data.net/isa/v1"
+  },
+  "@swagger/cat": {
+    "rootUrl": "https://isa-test.paragon-data.net/catsearch/v6"
+  },
+  "@swagger/av": {
+    "rootUrl": "https://isa-test.paragon-data.net/ava/v6"
+  },
+  "@swagger/checkout": {
+    "rootUrl": "https://isa-feature.paragon-data.net/checkout/v6"
+  },
+  "@swagger/crm": {
+    "rootUrl": "https://isa-feature.paragon-data.net/crm/v6"
+  },
+  "@swagger/oms": {
+    "rootUrl": "https://isa-feature.paragon-data.net/oms/v6"
+  },
+  "@swagger/print": {
+    "rootUrl": "https://isa-feature.paragon-data.net/print/v1"
+  },
+  "@swagger/eis": {
+    "rootUrl": "https://filialinformationsystem-test.paragon-systems.de/eiswebapi/v1"
+  },
+  "@swagger/remi": {
+    "rootUrl": "https://isa-feature.paragon-data.net/inv/v6"
+  },
+  "@swagger/wws": {
+    "rootUrl": "https://isa-test.paragon-data.net/wws/v1"
+  },
+  "hubs": {
+    "notifications": {
+      "url": "https://isa-feature.paragon-data.net/isa/v1/rt",
+      "enableAutomaticReconnect": false,
+      "httpOptions": {
+        "transport": 1,
+        "logMessageContent": true,
+        "skipNegotiation": true
+      }
+    }
+  },
+  "process": {
+    "ids": {
+      "goodsOut": 1000,
+      "goodsIn": 2000,
+      "taskCalendar": 3000,
+      "remission": 4000,
+      "packageInspection": 5000,
+      "assortment": 6000,
+      "pickupShelf": 7000
+    }
+  },
+  "checkForUpdates": 3600000,
+  "licence": {
+    "scandit": "Ae8F2Wx2RMq5Lvn7UUAlWzVFZTt2+ubMAF8XtDpmPlNkBeG/LWs1M7AbgDW0LQqYLnszClEENaEHS56/6Ts2vrJ1Ux03CXUjK3jUvZpF5OchXR1CpnmpepJ6WxPCd7LMVHUGG1BbwPLDTFjP3y8uT0caTSmmGrYQWAs4CZcEF+ZBabP0z7vfm+hCZF/ebj9qqCJZcW8nH/n19hohshllzYBjFXjh87P2lIh1s6yZS3OaQWWXo/o0AKdxx7T6CVyR0/G5zq6uYJWf6rs3euUBEhpzOZHbHZK86Lvy2AVBEyVkkcttlDW1J2fA4l1W1JV/Xibz8AQV6kG482EpGF42KEoK48paZgX3e1AQsqUtmqzw294dcP4zMVstnw5/WrwKKi/5E/nOOJT2txYP1ZufIjPrwNFsqTlv7xCQlHjMzFGYwT816yD5qLRLbwOtjrkUPXNZLZ06T4upvWwJDmm8XgdeoDqMjHdcO4lwji1bl9EiIYJ/2qnsk9yZ2FqSaHzn4cbiL0f5u2HFlNAP0GUujGRlthGhHi6o4dFU+WAxKsFMKVt+SfoQUazNKHFVQgiAklTIZxIc/HUVzRvOLMxf+wFDerraBtcqGJg+g/5mrWYqeDBGhCBHtKiYf6244IJ4afzNTiH1/30SJcRzXwbEa3A7q1fJTx9/nLTOfVPrJKBQs7f/OQs2dA7LDCel8mzXdbjvsNQaeU5+iCIAq6zbTNKy1xT8wwj+VZrQmtNJs+qeznD+u29nCM24h8xCmRpvNPo4/Mww/lrTNrrNwLBSn1pMIwsH7yS9hH0v0oNAM3A6bVtk1D9qEkbyw+xZa+MZGpMP0D0CdcsqHalPcm5r/Ik="
+  },
+  "gender": {
+    "0": "Keine Anrede",
+    "1": "Enby",
+    "2": "Herr",
+    "4": "Frau"
+  },
+  "@shared/icon": "/assets/icons.json"
+}

apps/isa-app/src/core/auth/auth.service.ts

@@ -5,6 +5,8 @@ import { isNullOrUndefined } from '@utils/common';
 import { AuthConfig, OAuthService } from 'angular-oauth2-oidc';
 import { JwksValidationHandler } from 'angular-oauth2-oidc-jwks';
 import { BehaviorSubject } from 'rxjs';
+import { logger } from '@isa/core/logging';
+import { Router } from '@angular/router';
 
 /**
  * Storage key for the URL to redirect to after login
@@ -15,9 +17,17 @@ const REDIRECT_URL_KEY = 'auth_redirect_url';
   providedIn: 'root',
 })
 export class AuthService {
-  private readonly _initialized = new BehaviorSubject<boolean>(false);
+  #logger = logger(() => ({ service: 'AuthService' }));
+  #router = inject(Router);
+
+  #initialized = new BehaviorSubject<boolean>(false);
   get initialized$() {
-    return this._initialized.asObservable();
+    return this.#initialized.asObservable();
+  }
+
+  #authenticated = new BehaviorSubject<boolean>(false);
+  get authenticated$() {
+    return this.#authenticated.asObservable();
   }
 
   private _authConfig: AuthConfig;
@@ -27,16 +37,21 @@ export class AuthService {
   ) {
     this._oAuthService.events?.subscribe((event) => {
       if (event.type === 'token_received') {
-        console.log(
-          'SSO Token Expiration:',
-          new Date(this._oAuthService.getAccessTokenExpiration()),
-        );
+        this.#logger.info('SSO token received', () => ({
+          tokenExpiration: new Date(
+            this._oAuthService.getAccessTokenExpiration(),
+          ).toISOString(),
+        }));
 
         // Handle redirect after successful authentication
         setTimeout(() => {
           const redirectUrl = this._getAndClearRedirectUrl();
           if (redirectUrl) {
-            window.location.href = redirectUrl;
+            this.#logger.debug('Redirecting after authentication', () => ({
+              redirectUrl,
+            }));
+
+            this.#router.navigateByUrl(redirectUrl);
           }
         }, 100);
       }
@@ -44,50 +59,72 @@ export class AuthService {
   }
 
   async init() {
-    if (this._initialized.getValue()) {
+    if (this.#initialized.getValue()) {
+      this.#logger.error(
+        'AuthService initialization attempted twice',
+        new Error('Already initialized'),
+      );
       throw new Error('AuthService is already initialized');
     }
 
+    this.#logger.info('Initializing AuthService');
+
     this._authConfig = this._config.get('@core/auth');
+    this.#logger.debug('Auth config loaded', () => ({
+      issuer: this._authConfig.issuer,
+      clientId: this._authConfig.clientId,
+      scope: this._authConfig.scope,
+    }));
 
     this._authConfig.redirectUri = window.location.origin;
-
     this._authConfig.silentRefreshRedirectUri =
       window.location.origin + '/silent-refresh.html';
     this._authConfig.useSilentRefresh = true;
 
+    this.#logger.debug('Auth URIs configured', () => ({
+      redirectUri: this._authConfig.redirectUri,
+      silentRefreshRedirectUri: this._authConfig.silentRefreshRedirectUri,
+    }));
+
     this._oAuthService.configure(this._authConfig);
     this._oAuthService.tokenValidationHandler = new JwksValidationHandler();
 
+    this.#logger.debug('Setting up automatic silent refresh');
     this._oAuthService.setupAutomaticSilentRefresh();
 
-    await this._oAuthService.loadDiscoveryDocumentAndTryLogin();
+    this.#logger.debug('Loading discovery document and attempting login');
+    const authenticated =
+      await this._oAuthService.loadDiscoveryDocumentAndTryLogin();
 
-    if (!this._oAuthService.getAccessToken()) {
-      throw new Error('No access token. User is not authenticated.');
-    }
+    this.#authenticated.next(authenticated);
+    this.#logger.info('AuthService initialized', () => ({ authenticated }));
 
-    this._initialized.next(true);
+    this.#initialized.next(true);
+    return authenticated;
   }
 
   isAuthenticated() {
-    return this.isIdTokenValid();
+    return this.#authenticated.getValue();
   }
 
   isIdTokenValid() {
-    console.log(
-      'ID Token Expiration:',
-      new Date(this._oAuthService.getIdTokenExpiration()),
-    );
-    return this._oAuthService.hasValidIdToken();
+    const expiration = new Date(this._oAuthService.getIdTokenExpiration());
+    const isValid = this._oAuthService.hasValidIdToken();
+    this.#logger.debug('ID token validation check', () => ({
+      expiration: expiration.toISOString(),
+      isValid,
+    }));
+    return isValid;
   }
 
   isAccessTokenValid() {
-    console.log(
-      'ACCESS Token Expiration:',
-      new Date(this._oAuthService.getAccessTokenExpiration()),
-    );
-    return this._oAuthService.hasValidAccessToken();
+    const expiration = new Date(this._oAuthService.getAccessTokenExpiration());
+    const isValid = this._oAuthService.hasValidAccessToken();
+    this.#logger.debug('Access token validation check', () => ({
+      expiration: expiration.toISOString(),
+      isValid,
+    }));
+    return isValid;
   }
 
   getToken() {
@@ -111,6 +148,7 @@ export class AuthService {
     if (isNullOrUndefined(token)) {
       return null;
     }
+
     const base64Url = token.split('.')[1];
     const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
 
@@ -135,18 +173,22 @@ export class AuthService {
   }
 
   login() {
+    this.#logger.info('Initiating login flow');
     this._saveRedirectUrl();
     this._oAuthService.initLoginFlow();
   }
 
   setKeyCardToken(token: string) {
+    this.#logger.debug('Setting keycard token');
     this._oAuthService.customQueryParams = {
       temp_token: token,
     };
   }
 
   async logout() {
+    this.#logger.info('Initiating logout');
     await this._oAuthService.revokeTokenAndLogout();
+    this.#logger.info('Logout completed');
   }
 
   hasRole(role: string | string[]) {
@@ -163,16 +205,20 @@ export class AuthService {
 
   async refresh() {
     try {
+      this.#logger.debug('Refreshing authentication token');
+
       if (
         this._authConfig.responseType.includes('code') &&
         this._authConfig.scope.includes('offline_access')
       ) {
         await this._oAuthService.refreshToken();
+        this.#logger.info('Token refreshed using refresh token');
       } else {
         await this._oAuthService.silentRefresh();
+        this.#logger.info('Token refreshed using silent refresh');
       }
     } catch (error) {
-      console.error(error);
+      this.#logger.error('Token refresh failed', error as Error);
     }
   }
 }

apps/isa-app/src/core/command/command.service.ts

@@ -1,54 +1,54 @@
-import { Injectable, Injector, Optional, SkipSelf } from '@angular/core';
-import { ActionHandler } from './action-handler.interface';
-import { FEATURE_ACTION_HANDLERS, ROOT_ACTION_HANDLERS } from './tokens';
-
-@Injectable()
-export class CommandService {
-  constructor(
-    private injector: Injector,
-    @Optional() @SkipSelf() private _parent: CommandService,
-  ) {}
-
-  async handleCommand<T>(command: string, data?: T): Promise<T> {
-    const actions = this.getActions(command);
-
-    for (const action of actions) {
-      const handler = this.getActionHandler(action);
-      if (!handler) {
-        console.error(
-          'CommandService.handleCommand',
-          'Action Handler does not exist',
-          { action },
-        );
-        throw new Error('Action Handler does not exist');
-      }
-      data = await handler.handler(data, this);
-    }
-    return data;
-  }
-
-  getActions(command: string) {
-    return command?.split('|') || [];
-  }
-
-  getActionHandler(action: string): ActionHandler | undefined {
-    const featureActionHandlers: ActionHandler[] = this.injector.get(
-      FEATURE_ACTION_HANDLERS,
-      [],
-    );
-    const rootActionHandlers: ActionHandler[] = this.injector.get(
-      ROOT_ACTION_HANDLERS,
-      [],
-    );
-
-    let handler = [...featureActionHandlers, ...rootActionHandlers].find(
-      (handler) => handler.action === action,
-    );
-
-    if (this._parent && !handler) {
-      handler = this._parent.getActionHandler(action);
-    }
-
-    return handler;
-  }
-}
+import { Injectable, Injector, Optional, SkipSelf } from '@angular/core';
+import { ActionHandler } from './action-handler.interface';
+import { FEATURE_ACTION_HANDLERS, ROOT_ACTION_HANDLERS } from './tokens';
+
+@Injectable()
+export class CommandService {
+  constructor(
+    private injector: Injector,
+    @Optional() @SkipSelf() private _parent: CommandService,
+  ) {}
+
+  async handleCommand<T>(command: string, data: T): Promise<T> {
+    const actions = this.getActions(command);
+
+    for (const action of actions) {
+      const handler = this.getActionHandler(action);
+      if (!handler) {
+        console.error(
+          'CommandService.handleCommand',
+          'Action Handler does not exist',
+          { action },
+        );
+        throw new Error('Action Handler does not exist');
+      }
+      data = await handler.handler(data, this);
+    }
+    return data;
+  }
+
+  getActions(command: string) {
+    return command?.split('|') || [];
+  }
+
+  getActionHandler(action: string): ActionHandler | undefined {
+    const featureActionHandlers: ActionHandler[] = this.injector.get(
+      FEATURE_ACTION_HANDLERS,
+      [],
+    );
+    const rootActionHandlers: ActionHandler[] = this.injector.get(
+      ROOT_ACTION_HANDLERS,
+      [],
+    );
+
+    let handler = [...featureActionHandlers, ...rootActionHandlers].find(
+      (handler) => handler.action === action,
+    );
+
+    if (this._parent && !handler) {
+      handler = this._parent.getActionHandler(action);
+    }
+
+    return handler;
+  }
+}

apps/isa-app/src/modal/purchase-options/purchase-options-modal.service.ts

@@ -12,6 +12,7 @@ import {
 } from '@isa/crm/data-access';
 import { TabService } from '@isa/core/tabs';
 import { BranchDTO } from '@generated/swagger/checkout-api';
+import { CheckoutMetadataService } from '@isa/checkout/data-access';
 
 /**
  * Service for opening and managing the Purchase Options Modal.
@@ -39,6 +40,7 @@ export class PurchaseOptionsModalService {
   #uiModal = inject(UiModalService);
   #tabService = inject(TabService);
   #crmTabMetadataService = inject(CrmTabMetadataService);
+  #checkoutMetadataService = inject(CheckoutMetadataService);
   #customerFacade = inject(CustomerFacade);
 
   /**
@@ -74,7 +76,10 @@ export class PurchaseOptionsModalService {
     };
 
     context.selectedCustomer = await this.#getSelectedCustomer(data);
-    context.selectedBranch = this.#getSelectedBranch(data.tabId);
+    context.selectedBranch = this.#getSelectedBranch(
+      data.tabId,
+      data.useRedemptionPoints,
+    );
     return this.#uiModal.open<string, PurchaseOptionsModalContext>({
       content: PurchaseOptionsModalComponent,
       data: context,
@@ -95,7 +100,10 @@ export class PurchaseOptionsModalService {
     return this.#customerFacade.fetchCustomer({ customerId });
   }
 
-  #getSelectedBranch(tabId: number): BranchDTO | undefined {
+  #getSelectedBranch(
+    tabId: number,
+    useRedemptionPoints: boolean,
+  ): BranchDTO | undefined {
     const tab = untracked(() =>
       this.#tabService.entities().find((t) => t.id === tabId),
     );
@@ -104,6 +112,10 @@ export class PurchaseOptionsModalService {
       return undefined;
     }
 
+    if (useRedemptionPoints) {
+      return this.#checkoutMetadataService.getSelectedBranch(tabId);
+    }
+
     const legacyProcessData = tab?.metadata?.process_data;
 
     if (

apps/isa-app/src/page/catalog/article-details/article-details-text/line-type.pipe.ts

@@ -1,4 +1,5 @@
 import { Pipe, PipeTransform } from '@angular/core';
+import { REIHE_PREFIX_PATTERN } from './reihe.constants';
 
 @Pipe({
   name: 'lineType',
@@ -7,8 +8,8 @@ import { Pipe, PipeTransform } from '@angular/core';
 })
 export class LineTypePipe implements PipeTransform {
   transform(value: string, ...args: any[]): 'text' | 'reihe' {
-    const REIHE_REGEX = /^Reihe:\s*"(.+)\"$/g;
-    const reihe = REIHE_REGEX.exec(value)?.[1];
+    const REIHE_REGEX = new RegExp(`^${REIHE_PREFIX_PATTERN}:\\s*"(.+)"$`, 'g');
+    const reihe = REIHE_REGEX.exec(value)?.[2];
     return reihe ? 'reihe' : 'text';
   }
 }

apps/isa-app/src/page/catalog/article-details/article-details-text/reihe-route.pipe.ts

@@ -1,9 +1,15 @@
-import { ChangeDetectorRef, OnDestroy, Pipe, PipeTransform } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  OnDestroy,
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 import { ApplicationService } from '@core/application';
 import { ProductCatalogNavigationService } from '@shared/services/navigation';
 import { isEqual } from 'lodash';
 import { Subscription, combineLatest, BehaviorSubject } from 'rxjs';
 import { distinctUntilChanged } from 'rxjs/operators';
+import { REIHE_PREFIX_PATTERN } from './reihe.constants';
 
 @Pipe({
   name: 'reiheRoute',
@@ -22,10 +28,13 @@ export class ReiheRoutePipe implements PipeTransform, OnDestroy {
     private application: ApplicationService,
     private cdr: ChangeDetectorRef,
   ) {
-    this.subscription = combineLatest([this.application.activatedProcessId$, this.value$])
+    this.subscription = combineLatest([
+      this.application.activatedProcessId$,
+      this.value$,
+    ])
       .pipe(distinctUntilChanged(isEqual))
       .subscribe(([processId, value]) => {
-        const REIHE_REGEX = /[";]|Reihe:/g; // Entferne jedes Semikolon, Anführungszeichen und den String Reihe:
+        const REIHE_REGEX = new RegExp(`[";]|${REIHE_PREFIX_PATTERN}:`, 'g'); // Entferne jedes Semikolon, Anführungszeichen und den String Reihe:/Reihe/Set:/Set/Reihe:
         const reihe = value?.replace(REIHE_REGEX, '')?.trim();
 
         if (!reihe) {
@@ -33,9 +42,15 @@ export class ReiheRoutePipe implements PipeTransform, OnDestroy {
           return;
         }
 
-        const main_qs = reihe.split('/')[0];
+        // Entferne Zahlen am Ende, die mit Leerzeichen, Komma, Slash oder Semikolon getrennt sind
+        // Beispiele: "Harry Potter 1" -> "Harry Potter", "Harry Potter,1" -> "Harry Potter", "Harry Potter/2" -> "Harry Potter"
+        const main_qs = reihe
+          .split('/')[0]
+          .replace(/[\s,;]+\d+$/g, '')
+          .trim();
 
-        const path = this.navigation.getArticleSearchResultsPath(processId).path;
+        const path =
+          this.navigation.getArticleSearchResultsPath(processId).path;
 
         this.result = {
           path,

apps/isa-app/src/page/catalog/article-details/article-details-text/reihe.constants.ts

@@ -0,0 +1,5 @@
+/**
+ * Shared regex pattern for matching Reihe line prefixes.
+ * Matches: "Reihe:", "Reihe/Set:", or "Set/Reihe:"
+ */
+export const REIHE_PREFIX_PATTERN = '(Reihe|Reihe\\/Set|Set\\/Reihe)';

apps/isa-app/src/page/checkout/page-checkout-routing.module.ts

@@ -4,6 +4,7 @@ import { CheckoutReviewComponent } from './checkout-review/checkout-review.compo
 import { CheckoutSummaryComponent } from './checkout-summary/checkout-summary.component';
 import { PageCheckoutComponent } from './page-checkout.component';
 import { CheckoutReviewDetailsComponent } from './checkout-review/details/checkout-review-details.component';
+import { canDeactivateTabCleanup } from '@isa/core/tabs';
 
 const routes: Routes = [
   {
@@ -22,10 +23,12 @@ const routes: Routes = [
       {
         path: 'summary',
         component: CheckoutSummaryComponent,
+        canDeactivate: [canDeactivateTabCleanup],
       },
       {
         path: 'summary/:orderIds',
         component: CheckoutSummaryComponent,
+        canDeactivate: [canDeactivateTabCleanup],
       },
       { path: '', pathMatch: 'full', redirectTo: 'review' },
     ],

apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details-item/customer-order-details-item.component.html

@@ -1,29 +1,66 @@
 @if (orderItem$ | async; as orderItem) {
   <div #features class="page-customer-order-details-item__features">
     @if (orderItem?.features?.prebooked) {
-      <img [uiOverlayTrigger]="prebookedTooltip" src="/assets/images/tag_icon_preorder.svg" [alt]="orderItem?.features?.prebooked" />
-      <ui-tooltip yPosition="above" xPosition="after" [yOffset]="-11" [xOffset]="-8" #prebookedTooltip [closeable]="true">
+      <img
+        [uiOverlayTrigger]="prebookedTooltip"
+        src="/assets/images/tag_icon_preorder.svg"
+        [alt]="orderItem?.features?.prebooked"
+      />
+      <ui-tooltip
+        yPosition="above"
+        xPosition="after"
+        [yOffset]="-11"
+        [xOffset]="-8"
+        #prebookedTooltip
+        [closeable]="true"
+      >
         Artikel wird für Sie vorgemerkt.
       </ui-tooltip>
     }
     @if (notificationsSent$ | async; as notificationsSent) {
       @if (notificationsSent?.NOTIFICATION_EMAIL) {
-        <img [uiOverlayTrigger]="emailTooltip" src="/assets/images/email_bookmark.svg" />
-        <ui-tooltip yPosition="above" xPosition="after" [yOffset]="-11" [xOffset]="-8" #emailTooltip [closeable]="true">
+        <img
+          [uiOverlayTrigger]="emailTooltip"
+          src="/assets/images/email_bookmark.svg"
+        />
+        <ui-tooltip
+          yPosition="above"
+          xPosition="after"
+          [yOffset]="-11"
+          [xOffset]="-8"
+          #emailTooltip
+          [closeable]="true"
+        >
           Per E-Mail benachrichtigt
           <br />
-          @for (notification of notificationsSent?.NOTIFICATION_EMAIL; track notification) {
+          @for (
+            notification of notificationsSent?.NOTIFICATION_EMAIL;
+            track notification
+          ) {
             {{ notification | date: 'dd.MM.yyyy | HH:mm' }} Uhr
             <br />
           }
         </ui-tooltip>
       }
       @if (notificationsSent?.NOTIFICATION_SMS) {
-        <img [uiOverlayTrigger]="smsTooltip" src="/assets/images/sms_bookmark.svg" />
-        <ui-tooltip yPosition="above" xPosition="after" [yOffset]="-11" [xOffset]="-8" #smsTooltip [closeable]="true">
+        <img
+          [uiOverlayTrigger]="smsTooltip"
+          src="/assets/images/sms_bookmark.svg"
+        />
+        <ui-tooltip
+          yPosition="above"
+          xPosition="after"
+          [yOffset]="-11"
+          [xOffset]="-8"
+          #smsTooltip
+          [closeable]="true"
+        >
           Per SMS benachrichtigt
           <br />
-          @for (notification of notificationsSent?.NOTIFICATION_SMS; track notification) {
+          @for (
+            notification of notificationsSent?.NOTIFICATION_SMS;
+            track notification
+          ) {
             {{ notification | date: 'dd.MM.yyyy | HH:mm' }} Uhr
             <br />
           }
@@ -33,7 +70,10 @@
   </div>
   <div class="page-customer-order-details-item__item-container">
     <div class="page-customer-order-details-item__thumbnail">
-      <img [src]="orderItem.product?.ean | productImage" [alt]="orderItem.product?.name" />
+      <img
+        [src]="orderItem.product?.ean | productImage"
+        [alt]="orderItem.product?.name"
+      />
     </div>
     <div class="page-customer-order-details-item__details">
       <div class="flex flex-row justify-between items-start mb-[1.3125rem]">
@@ -42,19 +82,29 @@
           #elementDistance="uiElementDistance"
           [style.max-width.px]="elementDistance.distanceChange | async"
           class="flex flex-col"
-          >
-          <div class="font-normal mb-[0.375rem]">{{ orderItem.product?.contributors }}</div>
+        >
+          @if (hasRewardPoints$ | async) {
+            <ui-label class="w-10 mb-2">Prämie</ui-label>
+          }
+          <div class="font-normal mb-[0.375rem]">
+            {{ orderItem.product?.contributors }}
+          </div>
           <div>{{ orderItem.product?.name }}</div>
         </h3>
         <div class="history-wrapper flex flex-col items-end justify-center">
-          <button class="cta-history text-p1" (click)="historyClick.emit(orderItem)">Historie</button>
+          <button
+            class="cta-history text-p1"
+            (click)="historyClick.emit(orderItem)"
+          >
+            Historie
+          </button>
           @if (selectable$ | async) {
             <input
               [ngModel]="selected$ | async"
               (ngModelChange)="setSelected($event)"
               class="isa-select-bullet mt-4"
               type="checkbox"
-              />
+            />
           }
         </div>
       </div>
@@ -72,19 +122,26 @@
               [showSpinner]="false"
             ></ui-quantity-dropdown>
           }
-          <span class="overall-quantity">(von {{ orderItem?.overallQuantity }})</span>
+          <span class="overall-quantity"
+            >(von {{ orderItem?.overallQuantity }})</span
+          >
         </div>
       </div>
       @if (!!orderItem.product?.formatDetail) {
         <div class="detail">
           <div class="label">Format</div>
           <div class="value">
-            @if (orderItem?.product?.format && orderItem?.product?.format !== 'UNKNOWN') {
+            @if (
+              orderItem?.product?.format &&
+              orderItem?.product?.format !== 'UNKNOWN'
+            ) {
               <img
                 class="format-icon"
-                [src]="'/assets/images/Icon_' + orderItem.product?.format + '.svg'"
+                [src]="
+                  '/assets/images/Icon_' + orderItem.product?.format + '.svg'
+                "
                 alt="format icon"
-                />
+              />
             }
             <span>{{ orderItem.product?.formatDetail }}</span>
           </div>
@@ -96,10 +153,17 @@
           <div class="value">{{ orderItem.product?.ean }}</div>
         </div>
       }
-      @if (orderItem.price !== undefined) {
+      @if (orderItem.price !== undefined || (hasRewardPoints$ | async)) {
         <div class="detail">
-          <div class="label">Preis</div>
-          <div class="value">{{ orderItem.price | currency: 'EUR' }}</div>
+          @if (hasRewardPoints$ | async) {
+            <div class="label">Prämie</div>
+            <div class="value">
+              {{ rewardPoints$ | async | number: '1.0-0' }} Lesepunkte
+            </div>
+          } @else {
+            <div class="label">Preis</div>
+            <div class="value">{{ orderItem.price | currency: 'EUR' }}</div>
+          }
         </div>
       }
       @if (!!orderItem.retailPrice?.vat?.inPercent) {
@@ -133,14 +197,23 @@
             orderItemFeature(orderItem) === 'Versand' ||
             orderItemFeature(orderItem) === 'B2B-Versand' ||
             orderItemFeature(orderItem) === 'DIG-Versand'
-            ) {
-            {{ orderItem?.estimatedDelivery ? 'Lieferung zwischen' : 'Lieferung ab' }}
+          ) {
+            {{
+              orderItem?.estimatedDelivery
+                ? 'Lieferung zwischen'
+                : 'Lieferung ab'
+            }}
           }
-          @if (orderItemFeature(orderItem) === 'Abholung' || orderItemFeature(orderItem) === 'Rücklage') {
+          @if (
+            orderItemFeature(orderItem) === 'Abholung' ||
+            orderItemFeature(orderItem) === 'Rücklage'
+          ) {
             Abholung ab
           }
         </div>
-        @if (!!orderItem?.estimatedDelivery || !!orderItem?.estimatedShippingDate) {
+        @if (
+          !!orderItem?.estimatedDelivery || !!orderItem?.estimatedShippingDate
+        ) {
           <div class="value bg-[#D8DFE5] rounded w-max px-2">
             @if (!!orderItem?.estimatedDelivery) {
               {{ orderItem?.estimatedDelivery?.start | date: 'dd.MM.yy' }} und
@@ -155,14 +228,22 @@
       </div>
       @if (getOrderItemTrackingData(orderItem); as trackingData) {
         <div class="page-customer-order-details-item__tracking-details">
-          <div class="label">{{ trackingData.length > 1 ? 'Sendungsnummern' : 'Sendungsnummer' }}</div>
+          <div class="label">
+            {{ trackingData.length > 1 ? 'Sendungsnummern' : 'Sendungsnummer' }}
+          </div>
           @for (tracking of trackingData; track tracking) {
             @if (tracking.trackingProvider === 'DHL' && !isNative) {
-              <a class="value text-[#0556B4]" [href]="getTrackingNumberLink(tracking.trackingNumber)" target="_blank">
+              <a
+                class="value text-[#0556B4]"
+                [href]="getTrackingNumberLink(tracking.trackingNumber)"
+                target="_blank"
+              >
                 {{ tracking.trackingProvider }}: {{ tracking.trackingNumber }}
               </a>
             } @else {
-              <p class="value">{{ tracking.trackingProvider }}: {{ tracking.trackingNumber }}</p>
+              <p class="value">
+                {{ tracking.trackingProvider }}: {{ tracking.trackingNumber }}
+              </p>
             }
           }
         </div>
@@ -206,7 +287,9 @@
         @if (!!receipt?.printedDate) {
           <div class="detail">
             <div class="label">Erstellt am</div>
-            <div class="value">{{ receipt?.printedDate | date: 'dd.MM.yy | HH:mm' }} Uhr</div>
+            <div class="value">
+              {{ receipt?.printedDate | date: 'dd.MM.yy | HH:mm' }} Uhr
+            </div>
           </div>
         }
         @if (!!receipt?.receiptText) {
@@ -219,12 +302,20 @@
           <div class="detail">
             <div class="label">Belegart</div>
             <div class="value">
-              {{ receipt?.receiptType === 1 ? 'Lieferschein' : receipt?.receiptType === 64 ? 'Zahlungsbeleg' : '-' }}
+              {{
+                receipt?.receiptType === 1
+                  ? 'Lieferschein'
+                  : receipt?.receiptType === 64
+                    ? 'Zahlungsbeleg'
+                    : '-'
+              }}
             </div>
           </div>
         }
       }
-      <div class="page-customer-order-details-item__comment flex flex-col items-start mt-[1.625rem]">
+      <div
+        class="page-customer-order-details-item__comment flex flex-col items-start mt-[1.625rem]"
+      >
         <div class="label mb-[0.375rem]">Anmerkung</div>
         <div class="flex flex-row w-full">
           <textarea
@@ -248,17 +339,23 @@
               <button
                 type="reset"
                 class="clear"
-                (click)="specialCommentControl.setValue(''); saveSpecialComment(); triggerResize()"
-                >
+                (click)="
+                  specialCommentControl.setValue('');
+                  saveSpecialComment();
+                  triggerResize()
+                "
+              >
                 <shared-icon icon="close" [size]="24"></shared-icon>
               </button>
             }
-            @if (specialCommentControl?.enabled && specialCommentControl.dirty) {
+            @if (
+              specialCommentControl?.enabled && specialCommentControl.dirty
+            ) {
               <button
                 class="cta-save"
                 type="submit"
                 (click)="saveSpecialComment()"
-                >
+              >
                 Speichern
               </button>
             }

apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details-item/customer-order-details-item.component.ts

@@ -15,12 +15,25 @@ import { DomainOmsService, DomainReceiptService } from '@domain/oms';
 import { ComponentStore } from '@ngrx/component-store';
 import { tapResponse } from '@ngrx/operators';
 
-import { OrderDTO, OrderItemListItemDTO, ReceiptDTO, ReceiptType } from '@generated/swagger/oms-api';
+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';
+import {
+  catchError,
+  filter,
+  first,
+  map,
+  switchMap,
+  withLatestFrom,
+} from 'rxjs/operators';
 import { CustomerOrderDetailsStore } from '../customer-order-details.store';
 import { EnvironmentService } from '@core/environment';
+import { getOrderItemRewardFeature } from '@isa/oms/data-access';
 
 export interface CustomerOrderDetailsItemComponentState {
   orderItem?: OrderItemListItemDTO;
@@ -59,7 +72,12 @@ export class CustomerOrderDetailsItemComponent
       // Remove Prev OrderItem from selected list
       this._store.selectOrderItem(this.orderItem, false);
 
-      this.patchState({ orderItem, quantity: orderItem?.quantity, receipts: [], more: false });
+      this.patchState({
+        orderItem,
+        quantity: orderItem?.quantity,
+        receipts: [],
+        more: false,
+      });
       this.specialCommentControl.reset(orderItem?.specialComment);
 
       // Add New OrderItem to selected list if selected was set to true by its input
@@ -94,8 +112,23 @@ export class CustomerOrderDetailsItemComponent
     ),
   );
 
-  canChangeQuantity$ = combineLatest([this.orderItem$, this._store.fetchPartial$]).pipe(
-    map(([item, partialPickup]) => ([16, 8192].includes(item?.processingStatus) || partialPickup) && item.quantity > 1),
+  hasRewardPoints$ = this.orderItem$.pipe(
+    map((orderItem) => getOrderItemRewardFeature(orderItem) !== undefined),
+  );
+
+  rewardPoints$ = this.orderItem$.pipe(
+    map((orderItem) => getOrderItemRewardFeature(orderItem)),
+  );
+
+  canChangeQuantity$ = combineLatest([
+    this.orderItem$,
+    this._store.fetchPartial$,
+  ]).pipe(
+    map(
+      ([item, partialPickup]) =>
+        ([16, 8192].includes(item?.processingStatus) || partialPickup) &&
+        item.quantity > 1,
+    ),
   );
 
   get quantity() {
@@ -111,7 +144,9 @@ export class CustomerOrderDetailsItemComponent
 
   @Input()
   get selected() {
-    return this._store.selectedeOrderItemSubsetIds.includes(this.orderItem?.orderItemSubsetId);
+    return this._store.selectedeOrderItemSubsetIds.includes(
+      this.orderItem?.orderItemSubsetId,
+    );
   }
   set selected(selected: boolean) {
     if (this.selected !== selected) {
@@ -120,22 +155,36 @@ export class CustomerOrderDetailsItemComponent
     }
   }
 
-  readonly selected$ = combineLatest([this.orderItem$, this._store.selectedeOrderItemSubsetIds$]).pipe(
-    map(([orderItem, selectedItems]) => selectedItems.includes(orderItem?.orderItemSubsetId)),
+  readonly selected$ = combineLatest([
+    this.orderItem$,
+    this._store.selectedeOrderItemSubsetIds$,
+  ]).pipe(
+    map(([orderItem, selectedItems]) =>
+      selectedItems.includes(orderItem?.orderItemSubsetId),
+    ),
   );
 
   @Output()
   selectedChange = new EventEmitter<boolean>();
 
   get selectable() {
-    return this._store.itemsSelectable && this._store.items.length > 1 && this._store.fetchPartial;
+    return (
+      this._store.itemsSelectable &&
+      this._store.items.length > 1 &&
+      this._store.fetchPartial
+    );
   }
 
   readonly selectable$ = combineLatest([
     this._store.items$,
     this._store.itemsSelectable$,
     this._store.fetchPartial$,
-  ]).pipe(map(([orderItems, selectable, fetchPartial]) => orderItems.length > 1 && selectable && fetchPartial));
+  ]).pipe(
+    map(
+      ([orderItems, selectable, fetchPartial]) =>
+        orderItems.length > 1 && selectable && fetchPartial,
+    ),
+  );
 
   get receipts() {
     return this.get((s) => s.receipts);
@@ -173,6 +222,7 @@ export class CustomerOrderDetailsItemComponent
     });
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
   ngOnInit() {}
 
   ngOnDestroy() {
@@ -182,37 +232,39 @@ export class CustomerOrderDetailsItemComponent
     this._onDestroy$.complete();
   }
 
-  loadReceipts = this.effect((done$: Observable<(receipts: ReceiptDTO[]) => void | undefined>) =>
-    done$.pipe(
-      withLatestFrom(this.orderItem$),
-      filter(([_, orderItem]) => !!orderItem),
-      switchMap(([done, orderItem]) =>
-        this._domainReceiptService
-          .getReceipts({
-            receiptType: 65 as ReceiptType,
-            ids: [orderItem.orderItemSubsetId],
-            eagerLoading: 1,
-          })
-          .pipe(
-            tapResponse(
-              (res) => {
-                const receipts = res.result.map((r) => r.item3?.data).filter((f) => !!f);
-                this.receipts = receipts;
+  loadReceipts = this.effect(
+    (done$: Observable<(receipts: ReceiptDTO[]) => void | undefined>) =>
+      done$.pipe(
+        withLatestFrom(this.orderItem$),
+        filter(([, orderItem]) => !!orderItem),
+        switchMap(([done, orderItem]) =>
+          this._domainReceiptService
+            .getReceipts({
+              receiptType: 65 as ReceiptType,
+              ids: [orderItem.orderItemSubsetId],
+              eagerLoading: 1,
+            })
+            .pipe(
+              tapResponse(
+                (res) => {
+                  const receipts = res.result
+                    .map((r) => r.item3?.data)
+                    .filter((f) => !!f);
+                  this.receipts = receipts;
 
-                if (typeof done === 'function') {
-                  done?.(receipts);
-                }
-              },
-              (err) => {
-                if (typeof done === 'function') {
-                  done?.([]);
-                }
-              },
-              () => {},
+                  if (typeof done === 'function') {
+                    done?.(receipts);
+                  }
+                },
+                () => {
+                  if (typeof done === 'function') {
+                    done?.([]);
+                  }
+                },
+              ),
             ),
-          ),
+        ),
       ),
-    ),
   );
 
   async saveSpecialComment() {
@@ -220,7 +272,7 @@ export class CustomerOrderDetailsItemComponent
 
     try {
       this.specialCommentControl.reset(this.specialCommentControl.value);
-      const res = await this._omsService
+      await this._omsService
         .patchComment({
           orderId,
           orderItemId,
@@ -230,7 +282,10 @@ export class CustomerOrderDetailsItemComponent
         .pipe(first())
         .toPromise();
 
-      this.orderItem = { ...this.orderItem, specialComment: this.specialCommentControl.value ?? '' };
+      this.orderItem = {
+        ...this.orderItem,
+        specialComment: this.specialCommentControl.value ?? '',
+      };
       this._store.updateOrderItems([this.orderItem]);
       this.specialCommentChanged.emit();
     } catch (error) {
@@ -253,8 +308,9 @@ export class CustomerOrderDetailsItemComponent
 
   orderItemFeature(orderItemListItem: OrderItemListItemDTO) {
     const orderItems = this.order?.items;
-    return orderItems?.find((orderItem) => orderItem.data.id === orderItemListItem.orderItemId)?.data?.features
-      ?.orderType;
+    return orderItems?.find(
+      (orderItem) => orderItem.data.id === orderItemListItem.orderItemId,
+    )?.data?.features?.orderType;
   }
 
   getOrderItemTrackingData(
@@ -263,15 +319,18 @@ export class CustomerOrderDetailsItemComponent
     const orderItems = this.order?.items;
     const completeTrackingInformation = orderItems
       ?.find((orderItem) => orderItem.data.id === orderItemListItem.orderItemId)
-      ?.data?.subsetItems?.find((subsetItem) => subsetItem.id === orderItemListItem.orderItemSubsetId)
-      ?.data?.trackingNumber;
+      ?.data?.subsetItems?.find(
+        (subsetItem) => subsetItem.id === orderItemListItem.orderItemSubsetId,
+      )?.data?.trackingNumber;
 
     if (!completeTrackingInformation) {
       return;
     }
 
     // Beispielnummer: 'DHL: 124124' - Bei mehreren Tracking-Informationen muss noch ein Splitter eingebaut werden, je nach dem welcher Trenner verwendet wird
-    const trackingInformationPairs = completeTrackingInformation.split(':').map((obj) => obj.trim());
+    const trackingInformationPairs = completeTrackingInformation
+      .split(':')
+      .map((obj) => obj.trim());
     return this._trackingTransformationHelper(trackingInformationPairs);
   }
 
@@ -282,7 +341,10 @@ export class CustomerOrderDetailsItemComponent
     return trackingInformationPairs.reduce(
       (acc, current, index, array) => {
         if (index % 2 === 0) {
-          acc.push({ trackingProvider: current, trackingNumber: array[index + 1] });
+          acc.push({
+            trackingProvider: current,
+            trackingNumber: array[index + 1],
+          });
         }
         return acc;
       },

apps/isa-app/src/page/customer-order/customer-order-details/customer-order-details.module.ts

@@ -17,6 +17,7 @@ import { ProductImageModule } from '@cdn/product-image';
 import { CustomerOrderDetailsStore } from './customer-order-details.store';
 import { UiDatepickerModule } from '@ui/datepicker';
 import { UiDropdownModule } from '@ui/dropdown';
+import { LabelComponent } from '@isa/ui/label';
 
 @NgModule({
   imports: [
@@ -34,6 +35,7 @@ import { UiDropdownModule } from '@ui/dropdown';
     CustomerOrderPipesModule,
     ProductImageModule,
     CustomerOrderDetailsTagsComponent,
+    LabelComponent,
   ],
   exports: [
     CustomerOrderDetailsComponent,
@@ -41,7 +43,11 @@ import { UiDropdownModule } from '@ui/dropdown';
     CustomerOrderDetailsHeaderComponent,
     CustomerOrderDetailsTagsComponent,
   ],
-  declarations: [CustomerOrderDetailsComponent, CustomerOrderDetailsItemComponent, CustomerOrderDetailsHeaderComponent],
+  declarations: [
+    CustomerOrderDetailsComponent,
+    CustomerOrderDetailsItemComponent,
+    CustomerOrderDetailsHeaderComponent,
+  ],
   providers: [CustomerOrderDetailsStore],
 })
 export class CustomerOrderDetailsModule {}

apps/isa-app/src/page/customer/customer-search/details-main-view/details-main-view.component.ts

@@ -36,13 +36,21 @@ import { CrmCustomerService } from '@domain/crm';
 import { MessageModalComponent, MessageModalData } from '@modal/message';
 import { GenderSettingsService } from '@shared/services/gender';
 import { toSignal } from '@angular/core/rxjs-interop';
-import { CrmTabMetadataService, Customer } from '@isa/crm/data-access';
-import { CustomerAdapter } from '@isa/checkout/data-access';
+import {
+  CrmTabMetadataService,
+  Customer,
+  AssignedPayer,
+} from '@isa/crm/data-access';
+import {
+  CustomerAdapter,
+  ShippingAddressAdapter,
+} from '@isa/checkout/data-access';
 import {
   NavigateAfterRewardSelection,
   RewardSelectionPopUpService,
 } from '@isa/checkout/shared/reward-selection-dialog';
 import { NavigationStateService } from '@isa/core/navigation';
+import { ShippingAddressDTO as CrmShippingAddressDTO } from '@generated/swagger/crm-api';
 
 export interface CustomerDetailsViewMainState {
   isBusy: boolean;
@@ -321,6 +329,12 @@ export class CustomerDetailsViewMainComponent
       }>('select-customer');
 
       if (context?.autoTriggerContinueFn) {
+        // Clear the autoTriggerContinueFn flag immediately (preserves returnUrl automatically)
+        await this._navigationState.patchContext(
+          { autoTriggerContinueFn: undefined },
+          'select-customer',
+        );
+
         // Auto-trigger continue() ONLY when coming from Kundenkarte
         this.continue();
       }
@@ -407,9 +421,18 @@ export class CustomerDetailsViewMainComponent
 
     await this._updateNotifcationChannelsAsync(currentBuyer);
 
-    this._setPayer();
+    await this._setPayer();
 
-    this._setShippingAddress();
+    await this._setShippingAddress();
+
+    // #5461 Priority fix: Check for regular shopping cart items BEFORE reward return URL
+    // This ensures that if a user has items in their regular cart, that takes precedence
+    // over any lingering reward flow context
+    if (this.shoppingCartHasItems) {
+      await this.#rewardSelectionPopUpFlow(this.processId);
+      this.setIsBusy(false);
+      return;
+    }
 
     // #5262 Check for reward selection flow before navigation
     if (this.hasReturnUrl()) {
@@ -429,16 +452,11 @@ export class CustomerDetailsViewMainComponent
       return;
     }
 
-    // Regular checkout navigation
-    if (this.shoppingCartHasItems) {
-      await this.#rewardSelectionPopUpFlow(this.processId);
-    } else {
-      // Navigation zur Artikelsuche
-      const path = this._catalogNavigation.getArticleSearchBasePath(
-        this.processId,
-      ).path;
-      await this._router.navigate(path);
-    }
+    // Navigation zur Artikelsuche
+    const path = this._catalogNavigation.getArticleSearchBasePath(
+      this.processId,
+    ).path;
+    await this._router.navigate(path);
 
     this.setIsBusy(false);
   }
@@ -631,8 +649,46 @@ export class CustomerDetailsViewMainComponent
     }
   }
 
-  @log
-  _setPayer() {
+  @logAsync
+  async _setPayer() {
+    // Check if there's a selected payer in metadata (from previous address selection)
+    const selectedPayerId = this.crmTabMetadataService.selectedPayerId(
+      this.processId,
+    );
+
+    if (selectedPayerId) {
+      // Load the selected payer from metadata
+      try {
+        const payerResponse = await this.customerService
+          .getPayer(selectedPayerId)
+          .toPromise();
+
+        if (payerResponse?.result) {
+          // Create AssignedPayer structure expected by adapter
+          // Type cast needed due to incompatible enum types between CRM and Checkout APIs
+          const assignedPayer = {
+            payer: {
+              id: selectedPayerId,
+              data: payerResponse.result,
+            },
+          } as AssignedPayer;
+
+          const payer = CustomerAdapter.toPayerFromAssignedPayer(assignedPayer);
+
+          if (payer) {
+            this._checkoutService.setPayer({
+              processId: this.processId,
+              payer,
+            });
+            return;
+          }
+        }
+      } catch (error) {
+        console.error('Failed to load selected payer from metadata', error);
+      }
+    }
+
+    // Fallback to current payer from component state
     if (this.payer) {
       this._checkoutService.setPayer({
         processId: this.processId,
@@ -641,8 +697,41 @@ export class CustomerDetailsViewMainComponent
     }
   }
 
-  @log
-  _setShippingAddress() {
+  @logAsync
+  async _setShippingAddress() {
+    // Check if there's a selected shipping address in metadata (from previous address selection)
+    const selectedShippingAddressId =
+      this.crmTabMetadataService.selectedShippingAddressId(this.processId);
+
+    if (selectedShippingAddressId) {
+      // Load the selected shipping address from metadata
+      try {
+        const addressResponse = await this.customerService
+          .getShippingAddress(selectedShippingAddressId)
+          .toPromise();
+
+        if (addressResponse?.result) {
+          const shippingAddress = ShippingAddressAdapter.fromCrmShippingAddress(
+            addressResponse.result as CrmShippingAddressDTO,
+          );
+
+          if (shippingAddress) {
+            this._checkoutService.setShippingAddress({
+              processId: this.processId,
+              shippingAddress,
+            });
+            return;
+          }
+        }
+      } catch (error) {
+        console.error(
+          'Failed to load selected shipping address from metadata',
+          error,
+        );
+      }
+    }
+
+    // Fallback to current shipping address from component state
     if (this.shippingAddress) {
       this._checkoutService.setShippingAddress({
         processId: this.processId,

apps/isa-app/src/page/customer/customer-search/kundenkarte-main-view/kundenkarte-main-view.component.css

@@ -1,3 +1,3 @@
 :host {
-  @apply grid grid-flow-row items-center gap-4 bg-surface text-surface-content rounded px-4 py-6;
+  @apply max-h-[calc(100vh-14rem)] grid grid-flow-row items-center gap-4 bg-surface text-surface-content rounded px-4 py-6 overflow-hidden overflow-y-scroll;
 }

apps/isa-app/src/page/customer/customer-search/kundenkarte-main-view/kundenkarte-main-view.component.html

@@ -1,34 +1,39 @@
-<div class="flex flex-row justify-end -mt-2">
-  <page-customer-menu [customerId]="customerId$ | async" [processId]="processId$ | async" [showCustomerCard]="false"></page-customer-menu>
-</div>
-<h1 class="text-center text-2xl font-bold">Kundenkarte</h1>
-@if (!(noDataFound$ | async)) {
-  <p class="text-center text-xl">
-    Alle Infos zu Ihrer Kundenkarte
-    <br />
-    und allen Partnerkarten.
-  </p>
-}
-@if (noDataFound$ | async) {
-  <p class="text-center text-xl">Keine Kundenkarte gefunden.</p>
-}
-@for (karte of primaryKundenkarte$ | async; track karte) {
-  <page-customer-kundenkarte
-    class="justify-self-center"
-    [cardDetails]="karte"
-    [isCustomerCard]="true"
-    [customerId]="customerId$ | async"
-  ></page-customer-kundenkarte>
-}
-
-@if ((partnerKundenkarte$ | async)?.length) {
-  <p class="text-center text-xl font-bold">Partnerkarten</p>
-}
-
-@for (karte of partnerKundenkarte$ | async; track karte) {
-  <page-customer-kundenkarte
-    class="justify-self-center"
-    [cardDetails]="karte"
-    [isCustomerCard]="false"
-  ></page-customer-kundenkarte>
-}
+<div class="flex flex-row justify-end -mt-2">
+  <page-customer-menu
+    [customerId]="customerId$ | async"
+    [processId]="processId$ | async"
+    [showCustomerCard]="false"
+  />
+</div>
+<crm-customer-loyalty-cards
+  [customerId]="customerId$ | async"
+  [tabId]="processId$ | async"
+  (navigateToPraemienshop)="onNavigateToPraemienshop()"
+  (cardUpdated)="reloadCardTransactionsAndCards()"
+  class="mt-4"
+/>
+@let activeCardCode = firstActiveCardCode();
+
+@if (activeCardCode) {
+  <crm-customer-bon-redemption
+    [cardCode]="activeCardCode"
+    class="mt-4"
+    (redeemed)="reloadCardTransactionsAndCards()"
+  />
+  <crm-customer-booking
+    [cardCode]="activeCardCode"
+    class="mt-4"
+    (booked)="reloadCardTransactionsAndCards()"
+  />
+}
+
+<crm-customer-card-transactions
+  [customerId]="customerId()"
+  class="mt-8"
+  (reload)="reloadCardTransactionsAndCards()"
+/>
+
+<utils-scroll-top-button
+  [target]="hostElement"
+  class="flex flex-col justify-self-end fixed bottom-6 right-6"
+></utils-scroll-top-button>

apps/isa-app/src/page/customer/customer-search/kundenkarte-main-view/kundenkarte-main-view.component.ts

@@ -1,63 +1,145 @@
-import { Component, ChangeDetectionStrategy, OnInit, OnDestroy, inject } from '@angular/core';
-import { CustomerSearchStore } from '../store';
-import { ActivatedRoute } from '@angular/router';
-import { Subject, combineLatest, of } from 'rxjs';
-import { catchError, map, share, switchMap } from 'rxjs/operators';
-import { CrmCustomerService } from '@domain/crm';
-import { KundenkarteComponent } from '../../components/kundenkarte';
-import { AsyncPipe } from '@angular/common';
-import { CustomerSearchNavigation } from '@shared/services/navigation';
-import { BonusCardInfoDTO } from '@generated/swagger/crm-api';
-import { CustomerMenuComponent } from '../../components/customer-menu';
-
-@Component({
-  selector: 'page-customer-kundenkarte-main-view',
-  templateUrl: 'kundenkarte-main-view.component.html',
-  styleUrls: ['kundenkarte-main-view.component.css'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  host: { class: 'page-customer-kundenkarte-main-view' },
-  imports: [CustomerMenuComponent, KundenkarteComponent, AsyncPipe],
-})
-export class KundenkarteMainViewComponent implements OnInit, OnDestroy {
-  private _store = inject(CustomerSearchStore);
-  private _activatedRoute = inject(ActivatedRoute);
-  private _customerService = inject(CrmCustomerService);
-  private _navigation = inject(CustomerSearchNavigation);
-
-  private _onDestroy$ = new Subject<void>();
-
-  customerId$ = this._activatedRoute.params.pipe(map((params) => params.customerId));
-
-  processId$ = this._store.processId$;
-
-  kundenkarte$ = this.customerId$.pipe(
-    switchMap((customerId) =>
-      this._customerService.getCustomerCard(customerId).pipe(
-        map((response) => response.result?.filter((f) => f.isActive)),
-        catchError(() => of<BonusCardInfoDTO[]>([])),
-      ),
-    ),
-    share(),
-  );
-
-  noDataFound$ = this.kundenkarte$.pipe(map((kundenkarte) => kundenkarte?.length == 0));
-
-  primaryKundenkarte$ = this.kundenkarte$.pipe(map((kundenkarte) => kundenkarte?.filter((k) => k.isPrimary)));
-
-  partnerKundenkarte$ = this.kundenkarte$.pipe(map((kundenkarte) => kundenkarte?.filter((k) => !k.isPrimary)));
-
-  detailsRoute$ = combineLatest([this._store.processId$, this._store.customerId$]).pipe(
-    map(([processId, customerId]) => this._navigation.detailsRoute({ processId, customerId })),
-  );
-
-  ngOnInit() {
-    this.customerId$.subscribe((customerId) => {
-      this._store.selectCustomer(customerId);
-    });
-  }
-
-  ngOnDestroy() {
-    this._onDestroy$.next();
-    this._onDestroy$.complete();
-  }
-}
+import {
+  Component,
+  ChangeDetectionStrategy,
+  inject,
+  computed,
+  effect,
+  ElementRef,
+  OnDestroy,
+} from '@angular/core';
+import { CustomerSearchStore } from '../store';
+import { ActivatedRoute, Router } from '@angular/router';
+import { map } from 'rxjs/operators';
+import { NavigationStateService } from '@isa/core/navigation';
+import { CustomerSearchNavigation } from '@shared/services/navigation';
+import { AsyncPipe } from '@angular/common';
+import { CustomerMenuComponent } from '../../components/customer-menu';
+import { CustomerLoyaltyCardsComponent } from '@isa/crm/feature/customer-loyalty-cards';
+import { CrmFeatureCustomerCardTransactionsComponent } from '@isa/crm/feature/customer-card-transactions';
+import { toSignal } from '@angular/core/rxjs-interop';
+import {
+  CustomerBonusCardsResource,
+  CustomerCardTransactionsResource,
+} from '@isa/crm/data-access';
+import { CrmFeatureCustomerBookingComponent } from '@isa/crm/feature/customer-booking';
+import { CrmFeatureCustomerBonRedemptionComponent } from '@isa/crm/feature/customer-bon-redemption';
+import { ScrollTopButtonComponent } from '@isa/utils/scroll-position';
+
+@Component({
+  selector: 'page-customer-kundenkarte-main-view',
+  templateUrl: 'kundenkarte-main-view.component.html',
+  styleUrls: ['kundenkarte-main-view.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  host: { class: 'page-customer-kundenkarte-main-view' },
+  imports: [
+    CustomerMenuComponent,
+    AsyncPipe,
+    CustomerLoyaltyCardsComponent,
+    CrmFeatureCustomerCardTransactionsComponent,
+    CrmFeatureCustomerBookingComponent,
+    CrmFeatureCustomerBonRedemptionComponent,
+    ScrollTopButtonComponent,
+  ],
+  providers: [CustomerBonusCardsResource, CustomerCardTransactionsResource],
+})
+export class KundenkarteMainViewComponent implements OnDestroy {
+  #reloadTimeoutId?: ReturnType<typeof setTimeout>;
+
+  private _store = inject(CustomerSearchStore);
+  private _activatedRoute = inject(ActivatedRoute);
+  #bonusCardsResource = inject(CustomerBonusCardsResource);
+  #cardTransactionsResource = inject(CustomerCardTransactionsResource);
+  elementRef = inject(ElementRef);
+  #router = inject(Router);
+  #navigationState = inject(NavigationStateService);
+  #customerNavigationService = inject(CustomerSearchNavigation);
+
+  /**
+   * Returns the native DOM element of this component
+   */
+  get hostElement() {
+    return this.elementRef.nativeElement;
+  }
+
+  customerId$ = this._activatedRoute.params.pipe(
+    map((params) => params.customerId),
+  );
+
+  processId$ = this._store.processId$;
+
+  /**
+   * Convert customerId observable to signal for reactive usage
+   */
+  readonly customerId = toSignal(this.customerId$);
+
+  /**
+   * Get the first active card code
+   */
+  readonly firstActiveCardCode = computed(() => {
+    const cards = this.#bonusCardsResource.resource.value();
+    const firstActiveCard = cards?.find((card) => card.isActive);
+    return firstActiveCard?.code;
+  });
+
+  constructor() {
+    // Load bonus cards when customerId changes
+    effect(() => {
+      const customerId = this.customerId();
+      if (customerId) {
+        this.#bonusCardsResource.params({ customerId: Number(customerId) });
+      }
+    });
+  }
+
+  /**
+   * Reloads both card transactions and bonus cards resources after a 500ms delay.
+   * Only triggers reload if the resource is not currently loading to prevent concurrent requests.
+   */
+  reloadCardTransactionsAndCards() {
+    this.#reloadTimeoutId = setTimeout(() => {
+      if (!this.#cardTransactionsResource.resource.isLoading()) {
+        this.#cardTransactionsResource.resource.reload();
+      }
+
+      if (!this.#bonusCardsResource.resource.isLoading()) {
+        this.#bonusCardsResource.resource.reload();
+      }
+    }, 500);
+  }
+
+  /**
+   * Handle navigation to Prämienshop with proper customer selection.
+   * Uses autoTriggerContinueFn pattern to auto-select customer via details view.
+   */
+  async onNavigateToPraemienshop(): Promise<void> {
+    const tabId = this._store.processId;
+    const customerId = this.customerId();
+
+    if (!customerId || !tabId) {
+      return;
+    }
+
+    // Preserve context for auto-triggering continue() in details view
+    this.#navigationState.preserveContext(
+      {
+        returnUrl: `/${tabId}/reward`,
+        autoTriggerContinueFn: true,
+      },
+      'select-customer',
+    );
+
+    // Navigate to customer details - will auto-trigger continue()
+    await this.#router.navigate(
+      this.#customerNavigationService.detailsRoute({
+        processId: tabId,
+        customerId: Number(customerId),
+      }).path,
+    );
+  }
+
+  ngOnDestroy(): void {
+    if (this.#reloadTimeoutId) {
+      clearTimeout(this.#reloadTimeoutId);
+    }
+  }
+}

apps/isa-app/src/page/customer/customer-search/order-details-main-view/order-item-list-item/order-item-list-item.component.html

@@ -1,113 +1,151 @@
-<div class="page-customer-order-item-list-item__card-content grid grid-cols-[6rem_1fr] gap-4">
-  <div>
-    <img class="rounded shadow mx-auto w-[5.9rem]" [src]="orderItem?.product?.ean | productImage" [alt]="orderItem?.product?.name" />
-  </div>
-  <div class="grid grid-flow-row gap-2">
-    <div class="grid grid-flow-col justify-between items-end">
-      <span>{{ orderItem.product?.contributors }}</span>
-      @if (orderDetailsHistoryRoute$ | async; as orderDetailsHistoryRoute) {
-        <a
-          [routerLink]="orderDetailsHistoryRoute.path"
-          [queryParams]="orderDetailsHistoryRoute.urlTree.queryParams"
-          [queryParamsHandling]="'merge'"
-          class="text-brand font-bold text-xl"
-          >
-          Historie
-        </a>
-      }
-    </div>
-    <div class="font-bold text-lg">
-      {{ orderItem?.product?.name }}
-    </div>
-    <div>
-      <span class="isa-label">
-        {{ processingStatus$ | async | orderItemProcessingStatus }}
-      </span>
-    </div>
-    @if (orderItemSubsetItem$ | async; as orderItemSubsetItem) {
-      <div class="grid grid-flow-row gap-2">
-        <div class="col-data">
-          <div class="col-label">Menge</div>
-          <div class="col-value">{{ orderItem?.quantity?.quantity }}x</div>
-        </div>
-        <div class="col-data">
-          <div class="col-label">Format</div>
-          <div class="col-value grid-flow-col grid gap-3 items-center justify-start">
-            <shared-icon [icon]="orderItem?.product?.format"></shared-icon>
-            <span>{{ orderItem?.product?.formatDetail }}</span>
-          </div>
-        </div>
-        <div class="col-data">
-          <div class="col-label">ISBN/EAN</div>
-          <div class="col-value">{{ orderItem?.product?.ean }}</div>
-        </div>
-        <div class="col-data">
-          <div class="col-label">Preis</div>
-          <div class="col-value">{{ orderItem?.unitPrice?.value?.value | currency: orderItem?.unitPrice?.value?.currency : 'code' }}</div>
-        </div>
-        <div class="col-data">
-          <div class="col-label">MwSt</div>
-          <div class="col-value">{{ orderItem?.unitPrice?.vat?.inPercent }}%</div>
-        </div>
-        <hr />
-        <div class="col-data">
-          <div class="col-label">Lieferant</div>
-          <div class="col-value">
-            {{ orderItemSubsetItem?.supplier?.data?.name }}
-          </div>
-        </div>
-        <div class="col-data">
-          <div class="col-label">Meldenummer</div>
-          <div class="col-value">{{ orderItemSubsetItem?.ssc }} - {{ orderItemSubsetItem?.sscText }}</div>
-        </div>
-        <div class="col-data">
-          <div class="col-label">Vsl. Lieferdatum</div>
-          <div class="col-value">
-            {{ orderItemSubsetItem?.estimatedShippingDate | date: 'dd.MM.yyyy' }}
-          </div>
-        </div>
-        @if (orderItemSubsetItem?.preferredPickUpDate) {
-          <div class="col-data">
-            <div class="col-label">Zurücklegen bis</div>
-            <div class="col-value">
-              {{ orderItemSubsetItem?.preferredPickUpDate | date: 'dd.MM.yyyy' }}
-            </div>
-          </div>
-        }
-        <hr />
-        @if (orderItemSubsetItem?.compartmentCode) {
-          <div class="col-data">
-            <div class="col-label">Abholfachnummer</div>
-            <div class="col-value">
-              <span>{{ orderItemSubsetItem?.compartmentCode }}</span>
-              @if (orderItemSubsetItem?.compartmentInfo) {
-                <span>_{{ orderItemSubsetItem?.compartmentInfo }}</span>
-              }
-            </div>
-          </div>
-        }
-        <div class="col-data">
-          <div class="col-label">Vormerker</div>
-          <div class="col-value">{{ isPrebooked$ | async }}</div>
-        </div>
-        <hr />
-        <div class="col-data">
-          <div class="col-label">Zahlungsweg</div>
-          <div class="col-value">-</div>
-        </div>
-        <div class="col-data">
-          <div class="col-label">Zahlungsart</div>
-          <div class="col-value">
-            {{ orderPaymentType$ | async | paymentType }}
-          </div>
-        </div>
-        <div class="col-data">
-          <div class="col-label">Anmerkung</div>
-          <div class="col-value">
-            {{ orderItemSubsetItem?.specialComment || '-' }}
-          </div>
-        </div>
-      </div>
-    }
-  </div>
-</div>
+<div
+  class="page-customer-order-item-list-item__card-content grid grid-cols-[6rem_1fr] gap-4"
+>
+  <div class="flex flex-col gap-2 justify-start items-center">
+    @let ean = orderItem?.product?.ean;
+    @let name = orderItem?.product?.name;
+    @if (ean && name) {
+      <img
+        class="rounded shadow mx-auto w-[5.9rem]"
+        [src]="ean | productImage"
+        [alt]="name"
+      />
+    }
+  </div>
+  <div class="grid grid-flow-row gap-2">
+    @if (hasRewardPoints$ | async) {
+      <ui-label class="w-10">Prämie</ui-label>
+    }
+    <div class="grid grid-flow-col justify-between items-end">
+      <span>{{ orderItem.product?.contributors }}</span>
+      @if (orderDetailsHistoryRoute$ | async; as orderDetailsHistoryRoute) {
+        <a
+          [routerLink]="orderDetailsHistoryRoute.path"
+          [queryParams]="orderDetailsHistoryRoute.urlTree.queryParams"
+          [queryParamsHandling]="'merge'"
+          class="text-brand font-bold text-xl relative -top-8"
+        >
+          Historie
+        </a>
+      }
+    </div>
+    <div class="font-bold text-lg">
+      {{ orderItem?.product?.name }}
+    </div>
+    <div>
+      <span class="isa-label">
+        {{ processingStatus$ | async | orderItemProcessingStatus }}
+      </span>
+    </div>
+    @if (orderItemSubsetItem$ | async; as orderItemSubsetItem) {
+      <div class="grid grid-flow-row gap-2">
+        <div class="col-data">
+          <div class="col-label">Menge</div>
+          <div class="col-value">{{ orderItem?.quantity?.quantity }}x</div>
+        </div>
+        <div class="col-data">
+          <div class="col-label">Format</div>
+          <div
+            class="col-value grid-flow-col grid gap-3 items-center justify-start"
+          >
+            @let format = orderItem?.product?.format;
+            @if (format) {
+              <shared-icon [icon]="orderItem?.product?.format"></shared-icon>
+            }
+            <span>{{ orderItem?.product?.formatDetail }}</span>
+          </div>
+        </div>
+        <div class="col-data">
+          <div class="col-label">ISBN/EAN</div>
+          <div class="col-value">{{ orderItem?.product?.ean }}</div>
+        </div>
+        <div class="col-data">
+          @if (hasRewardPoints$ | async) {
+            <div class="col-label">Prämie</div>
+            <div class="col-value">
+              {{ rewardPoints$ | async | number: '1.0-0' }} Lesepunkte
+            </div>
+          } @else {
+            <div class="col-label">Preis</div>
+            <div class="col-value">
+              {{
+                orderItem?.unitPrice?.value?.value
+                  | currency: orderItem?.unitPrice?.value?.currency : 'code'
+              }}
+            </div>
+          }
+        </div>
+        <div class="col-data">
+          <div class="col-label">MwSt</div>
+          <div class="col-value">
+            {{ orderItem?.unitPrice?.vat?.inPercent }}%
+          </div>
+        </div>
+        <hr />
+        <div class="col-data">
+          <div class="col-label">Lieferant</div>
+          <div class="col-value">
+            {{ orderItemSubsetItem?.supplier?.data?.name }}
+          </div>
+        </div>
+        <div class="col-data">
+          <div class="col-label">Meldenummer</div>
+          <div class="col-value">
+            {{ orderItemSubsetItem?.ssc }} - {{ orderItemSubsetItem?.sscText }}
+          </div>
+        </div>
+        <div class="col-data">
+          <div class="col-label">Vsl. Lieferdatum</div>
+          <div class="col-value">
+            {{
+              orderItemSubsetItem?.estimatedShippingDate | date: 'dd.MM.yyyy'
+            }}
+          </div>
+        </div>
+        @if (orderItemSubsetItem?.preferredPickUpDate) {
+          <div class="col-data">
+            <div class="col-label">Zurücklegen bis</div>
+            <div class="col-value">
+              {{
+                orderItemSubsetItem?.preferredPickUpDate | date: 'dd.MM.yyyy'
+              }}
+            </div>
+          </div>
+        }
+        <hr />
+        @if (orderItemSubsetItem?.compartmentCode) {
+          <div class="col-data">
+            <div class="col-label">Abholfachnummer</div>
+            <div class="col-value">
+              <span>{{ orderItemSubsetItem?.compartmentCode }}</span>
+              @if (orderItemSubsetItem?.compartmentInfo) {
+                <span>_{{ orderItemSubsetItem?.compartmentInfo }}</span>
+              }
+            </div>
+          </div>
+        }
+        <div class="col-data">
+          <div class="col-label">Vormerker</div>
+          <div class="col-value">{{ isPrebooked$ | async }}</div>
+        </div>
+        <hr />
+        <div class="col-data">
+          <div class="col-label">Zahlungsweg</div>
+          <div class="col-value">-</div>
+        </div>
+        <div class="col-data">
+          <div class="col-label">Zahlungsart</div>
+          <div class="col-value">
+            {{ orderPaymentType$ | async | paymentType }}
+          </div>
+        </div>
+        <div class="col-data">
+          <div class="col-label">Anmerkung</div>
+          <div class="col-value">
+            {{ orderItemSubsetItem?.specialComment || '-' }}
+          </div>
+        </div>
+      </div>
+    }
+  </div>
+</div>

apps/isa-app/src/page/customer/customer-search/order-details-main-view/order-item-list-item/order-item-list-item.component.ts

@@ -1,88 +1,133 @@
-import { AsyncPipe, CurrencyPipe, DatePipe } from '@angular/common';
-import { Component, ChangeDetectionStrategy, Input, OnDestroy, OnInit, inject } from '@angular/core';
-import { ActivatedRoute, RouterLink } from '@angular/router';
-import { ProductImagePipe } from '@cdn/product-image';
-import { OrderItemProcessingStatusPipe } from '@shared/pipes/order';
-import { OrderItemDTO } from '@generated/swagger/oms-api';
-import { BehaviorSubject, Subject, combineLatest } from 'rxjs';
-import { map, takeUntil } from 'rxjs/operators';
-import { CustomerSearchStore } from '../../store';
-import { CustomerSearchNavigation } from '@shared/services/navigation';
-import { PaymentTypePipe } from '@shared/pipes/customer';
-
-@Component({
-  selector: 'page-customer-order-item-list-item',
-  templateUrl: 'order-item-list-item.component.html',
-  styleUrls: ['order-item-list-item.component.css'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  host: { class: 'page-customer-order-item-list-item' },
-  imports: [
-    AsyncPipe,
-    DatePipe,
-    ProductImagePipe,
-    CurrencyPipe,
-    RouterLink,
-    PaymentTypePipe,
-    OrderItemProcessingStatusPipe
-  ],
-})
-export class CustomerOrderItemListItemComponent implements OnInit, OnDestroy {
-  private _activatedRoute = inject(ActivatedRoute);
-  private _store = inject(CustomerSearchStore);
-  private _navigation = inject(CustomerSearchNavigation);
-
-  private _onDestroy = new Subject<void>();
-
-  private _orderItemSub = new BehaviorSubject<OrderItemDTO>(undefined);
-
-  @Input()
-  get orderItem() {
-    return this._orderItemSub.getValue();
-  }
-
-  set orderItem(value: OrderItemDTO) {
-    this._orderItemSub.next(value);
-  }
-  orderId$ = this._activatedRoute.params.pipe(map((params) => Number(params.orderId)));
-
-  order$ = this._store.order$;
-
-  orderPaymentType$ = this.order$.pipe(map((order) => order?.paymentType));
-
-  customerId$ = this._activatedRoute.params.pipe(map((params) => Number(params.customerId)));
-
-  orderItemOrderType$ = this._orderItemSub.pipe(map((orderItem) => orderItem?.features?.orderType));
-
-  orderItemSubsetItem$ = this._orderItemSub.pipe(map((orderItem) => orderItem?.subsetItems?.[0]?.data));
-
-  orderDetailsHistoryRoute$ = combineLatest([
-    this.customerId$,
-    this._store.processId$,
-    this.orderId$,
-    this._orderItemSub,
-  ]).pipe(
-    map(([customerId, processId, orderId, orderItem]) =>
-      this._navigation.orderDetailsHistoryRoute({ processId, customerId, orderId, orderItemId: orderItem?.id }),
-    ),
-  );
-
-  isPrebooked$ = this.orderItemSubsetItem$.pipe(map((subsetItem) => (subsetItem?.isPrebooked ? 'Ja' : 'Nein')));
-
-  processingStatus$ = this.orderItemSubsetItem$.pipe(map((subsetItem) => subsetItem?.processingStatus));
-
-  ngOnInit() {
-    this.customerId$.pipe(takeUntil(this._onDestroy)).subscribe((customerId) => {
-      this._store.selectCustomer({ customerId });
-    });
-
-    this.orderId$.pipe(takeUntil(this._onDestroy)).subscribe((orderId) => {
-      this._store.selectOrder(+orderId);
-    });
-  }
-
-  ngOnDestroy() {
-    this._onDestroy.next();
-    this._onDestroy.complete();
-    this._orderItemSub.complete();
-  }
-}
+import {
+  AsyncPipe,
+  CurrencyPipe,
+  DatePipe,
+  DecimalPipe,
+} from '@angular/common';
+import {
+  Component,
+  ChangeDetectionStrategy,
+  Input,
+  OnDestroy,
+  OnInit,
+  inject,
+} from '@angular/core';
+import { ActivatedRoute, RouterLink } from '@angular/router';
+import { ProductImagePipe } from '@cdn/product-image';
+import { OrderItemProcessingStatusPipe } from '@shared/pipes/order';
+import { OrderItemDTO } from '@generated/swagger/oms-api';
+import { BehaviorSubject, Subject, combineLatest } from 'rxjs';
+import { map, takeUntil } from 'rxjs/operators';
+import { CustomerSearchStore } from '../../store';
+import { CustomerSearchNavigation } from '@shared/services/navigation';
+import { PaymentTypePipe } from '@shared/pipes/customer';
+import { LabelComponent } from '@isa/ui/label';
+import { getOrderItemRewardFeature } from '@isa/oms/data-access';
+import { IconComponent } from '@shared/components/icon';
+
+@Component({
+  selector: 'page-customer-order-item-list-item',
+  templateUrl: 'order-item-list-item.component.html',
+  styleUrls: ['order-item-list-item.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  host: { class: 'page-customer-order-item-list-item' },
+  imports: [
+    AsyncPipe,
+    DatePipe,
+    ProductImagePipe,
+    CurrencyPipe,
+    RouterLink,
+    PaymentTypePipe,
+    OrderItemProcessingStatusPipe,
+    LabelComponent,
+    IconComponent,
+    DecimalPipe,
+  ],
+})
+export class CustomerOrderItemListItemComponent implements OnInit, OnDestroy {
+  private _activatedRoute = inject(ActivatedRoute);
+  private _store = inject(CustomerSearchStore);
+  private _navigation = inject(CustomerSearchNavigation);
+
+  private _onDestroy = new Subject<void>();
+
+  private _orderItemSub = new BehaviorSubject<OrderItemDTO>(undefined);
+
+  @Input()
+  get orderItem() {
+    return this._orderItemSub.getValue();
+  }
+
+  set orderItem(value: OrderItemDTO) {
+    this._orderItemSub.next(value);
+  }
+  orderId$ = this._activatedRoute.params.pipe(
+    map((params) => Number(params.orderId)),
+  );
+
+  order$ = this._store.order$;
+
+  orderPaymentType$ = this.order$.pipe(map((order) => order?.paymentType));
+
+  customerId$ = this._activatedRoute.params.pipe(
+    map((params) => Number(params.customerId)),
+  );
+
+  orderItemOrderType$ = this._orderItemSub.pipe(
+    map((orderItem) => orderItem?.features?.orderType),
+  );
+
+  orderItemSubsetItem$ = this._orderItemSub.pipe(
+    map((orderItem) => orderItem?.subsetItems?.[0]?.data),
+  );
+
+  orderDetailsHistoryRoute$ = combineLatest([
+    this.customerId$,
+    this._store.processId$,
+    this.orderId$,
+    this._orderItemSub,
+  ]).pipe(
+    map(([customerId, processId, orderId, orderItem]) =>
+      this._navigation.orderDetailsHistoryRoute({
+        processId,
+        customerId,
+        orderId,
+        orderItemId: orderItem?.id,
+      }),
+    ),
+  );
+
+  isPrebooked$ = this.orderItemSubsetItem$.pipe(
+    map((subsetItem) => (subsetItem?.isPrebooked ? 'Ja' : 'Nein')),
+  );
+
+  processingStatus$ = this.orderItemSubsetItem$.pipe(
+    map((subsetItem) => subsetItem?.processingStatus),
+  );
+
+  hasRewardPoints$ = this._orderItemSub.pipe(
+    map((orderItem) => getOrderItemRewardFeature(orderItem) !== undefined),
+  );
+
+  rewardPoints$ = this._orderItemSub.pipe(
+    map((orderItem) => getOrderItemRewardFeature(orderItem)),
+  );
+
+  ngOnInit() {
+    this.customerId$
+      .pipe(takeUntil(this._onDestroy))
+      .subscribe((customerId) => {
+        this._store.selectCustomer({ customerId });
+      });
+
+    this.orderId$.pipe(takeUntil(this._onDestroy)).subscribe((orderId) => {
+      this._store.selectOrder(+orderId);
+    });
+  }
+
+  ngOnDestroy() {
+    this._onDestroy.next();
+    this._onDestroy.complete();
+    this._orderItemSub.complete();
+  }
+}

apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-item/pickup-shelf-details-item.component.html

@@ -1,31 +1,75 @@
 @if (orderItem) {
   <div #features class="page-pickup-shelf-details-item__features">
     @if (orderItem?.features?.prebooked) {
-      <img [uiOverlayTrigger]="prebookedTooltip" src="/assets/images/tag_icon_preorder.svg" [alt]="orderItem?.features?.prebooked" />
-      <ui-tooltip yPosition="above" xPosition="after" [yOffset]="-11" [xOffset]="-8" #prebookedTooltip [closeable]="true">
+      <img
+        [uiOverlayTrigger]="prebookedTooltip"
+        src="/assets/images/tag_icon_preorder.svg"
+        [alt]="orderItem?.features?.prebooked"
+      />
+      <ui-tooltip
+        yPosition="above"
+        xPosition="after"
+        [yOffset]="-11"
+        [xOffset]="-8"
+        #prebookedTooltip
+        [closeable]="true"
+      >
         Artikel wird für Sie vorgemerkt.
       </ui-tooltip>
     }
     @if (hasEmailNotification$ | async) {
-      <img [uiOverlayTrigger]="emailTooltip" src="/assets/images/email_bookmark.svg" />
-      <ui-tooltip yPosition="above" xPosition="after" [yOffset]="-11" [xOffset]="-8" #emailTooltip [closeable]="true">
+      <img
+        [uiOverlayTrigger]="emailTooltip"
+        src="/assets/images/email_bookmark.svg"
+      />
+      <ui-tooltip
+        yPosition="above"
+        xPosition="after"
+        [yOffset]="-11"
+        [xOffset]="-8"
+        #emailTooltip
+        [closeable]="true"
+      >
         Per E-Mail benachrichtigt
         <br />
-        @for (notifications of emailNotificationDates$ | async; track notifications) {
-          @for (notificationDate of notifications.dates; track notificationDate) {
-            {{ notifications.type | notificationType }} {{ notificationDate | date: 'dd.MM.yyyy | HH:mm' }} Uhr
+        @for (
+          notifications of emailNotificationDates$ | async;
+          track notifications
+        ) {
+          @for (
+            notificationDate of notifications.dates;
+            track notificationDate
+          ) {
+            {{ notifications.type | notificationType }}
+            {{ notificationDate | date: 'dd.MM.yyyy | HH:mm' }} Uhr
             <br />
           }
         }
       </ui-tooltip>
     }
     @if (hasSmsNotification$ | async) {
-      <img [uiOverlayTrigger]="smsTooltip" src="/assets/images/sms_bookmark.svg" />
-      <ui-tooltip yPosition="above" xPosition="after" [yOffset]="-11" [xOffset]="-8" #smsTooltip [closeable]="true">
+      <img
+        [uiOverlayTrigger]="smsTooltip"
+        src="/assets/images/sms_bookmark.svg"
+      />
+      <ui-tooltip
+        yPosition="above"
+        xPosition="after"
+        [yOffset]="-11"
+        [xOffset]="-8"
+        #smsTooltip
+        [closeable]="true"
+      >
         Per SMS benachrichtigt
         <br />
-        @for (notifications of smsNotificationDates$ | async; track notifications) {
-          @for (notificationDate of notifications.dates; track notificationDate) {
+        @for (
+          notifications of smsNotificationDates$ | async;
+          track notifications
+        ) {
+          @for (
+            notificationDate of notifications.dates;
+            track notificationDate
+          ) {
             {{ notificationDate | date: 'dd.MM.yyyy | HH:mm' }} Uhr
             <br />
           }
@@ -39,270 +83,336 @@
         [productImageNavigation]="orderItem?.product?.ean"
         [src]="orderItem.product?.ean | productImage"
         [alt]="orderItem.product?.name"
-        />
+      />
+    </div>
+    <div class="page-pickup-shelf-details-item__details">
+      <div class="flex flex-row justify-between items-start mb-[1.3125rem]">
+        <h3
+          [uiElementDistance]="features"
+          #elementDistance="uiElementDistance"
+          [style.max-width.px]="elementDistance.distanceChange | async"
+          class="flex flex-col"
+        >
+          @if (hasRewardPoints$ | async) {
+            <ui-label class="w-10 mb-2">Prämie</ui-label>
+          }
+          <div class="font-normal mb-[0.375rem]">
+            {{ orderItem.product?.contributors }}
+          </div>
+          <div>{{ orderItem.product?.name }}</div>
+        </h3>
+        <div class="history-wrapper flex flex-col items-end justify-center">
+          <button
+            class="cta-history text-p1"
+            (click)="historyClick.emit(orderItem)"
+          >
+            Historie
+          </button>
+          @if (selectable$ | async) {
+            <input
+              [ngModel]="selected$ | async"
+              (ngModelChange)="
+                setSelected($event);
+                tracker.trackEvent({
+                  category: 'pickup-shelf-list-item',
+                  action: 'select',
+                  name: orderItem?.product?.name,
+                  value: $event ? 1 : 0,
+                })
+              "
+              class="isa-select-bullet mt-4"
+              type="checkbox"
+              matomoTracker
+              #tracker="matomo"
+            />
+          }
+        </div>
       </div>
-      <div class="page-pickup-shelf-details-item__details">
-        <div class="flex flex-row justify-between items-start mb-[1.3125rem]">
-          <h3
-            [uiElementDistance]="features"
-            #elementDistance="uiElementDistance"
-            [style.max-width.px]="elementDistance.distanceChange | async"
-            class="flex flex-col"
-            >
-            <div class="font-normal mb-[0.375rem]">{{ orderItem.product?.contributors }}</div>
-            <div>{{ orderItem.product?.name }}</div>
-          </h3>
-          <div class="history-wrapper flex flex-col items-end justify-center">
-            <button class="cta-history text-p1" (click)="historyClick.emit(orderItem)">Historie</button>
-            @if (selectable$ | async) {
-              <input
-                [ngModel]="selected$ | async"
-            (ngModelChange)="
-              setSelected($event);
-              tracker.trackEvent({
-                category: 'pickup-shelf-list-item',
-                action: 'select',
-                name: orderItem?.product?.name,
-                value: $event ? 1 : 0,
-              })
-            "
-                class="isa-select-bullet mt-4"
-                type="checkbox"
-                matomoTracker
-                #tracker="matomo"
-                />
-            }
-          </div>
+      <div class="detail">
+        <div class="label">Menge</div>
+        <div class="value">
+          @if (!(canChangeQuantity$ | async)) {
+            {{ orderItem?.quantity }}x
+          }
+          @if (canChangeQuantity$ | async) {
+            <ui-quantity-dropdown
+              [showTrash]="false"
+              [range]="orderItem?.quantity"
+              [(ngModel)]="quantity"
+              (ngModelChange)="
+                tracker.trackEvent({
+                  category: 'pickup-shelf-list-item',
+                  action: 'quantity',
+                  name: orderItem?.product?.name,
+                  value: $event,
+                })
+              "
+              [showSpinner]="false"
+              matomoTracker
+              #tracker="matomo"
+            ></ui-quantity-dropdown>
+          }
+          <span class="overall-quantity"
+            >(von {{ orderItem?.overallQuantity }})</span
+          >
         </div>
+      </div>
+      @if (!!orderItem.product?.formatDetail) {
         <div class="detail">
-          <div class="label">Menge</div>
+          <div class="label">Format</div>
           <div class="value">
-            @if (!(canChangeQuantity$ | async)) {
-              {{ orderItem?.quantity }}x
+            @if (
+              orderItem?.product?.format &&
+              orderItem?.product?.format !== 'UNKNOWN'
+            ) {
+              <img
+                class="format-icon"
+                [src]="
+                  '/assets/images/Icon_' + orderItem.product?.format + '.svg'
+                "
+                alt="format icon"
+              />
             }
-            @if (canChangeQuantity$ | async) {
-              <ui-quantity-dropdown
-                [showTrash]="false"
-                [range]="orderItem?.quantity"
-                [(ngModel)]="quantity"
-            (ngModelChange)="
-              tracker.trackEvent({ category: 'pickup-shelf-list-item', action: 'quantity', name: orderItem?.product?.name, value: $event })
-            "
-                [showSpinner]="false"
-                matomoTracker
-                #tracker="matomo"
-              ></ui-quantity-dropdown>
-            }
-            <span class="overall-quantity">(von {{ orderItem?.overallQuantity }})</span>
+            <span>{{ orderItem.product?.formatDetail }}</span>
           </div>
         </div>
-        @if (!!orderItem.product?.formatDetail) {
-          <div class="detail">
-            <div class="label">Format</div>
+      }
+      @if (!!orderItem.product?.ean) {
+        <div class="detail">
+          <div class="label">ISBN/EAN</div>
+          <div class="value">{{ orderItem.product?.ean }}</div>
+        </div>
+      }
+      @if (orderItem.price !== undefined || (hasRewardPoints$ | async)) {
+        <div class="detail">
+          @if (hasRewardPoints$ | async) {
+            <div class="label">Prämie</div>
             <div class="value">
-              @if (orderItem?.product?.format && orderItem?.product?.format !== 'UNKNOWN') {
-                <img
-                  class="format-icon"
-                  [src]="'/assets/images/Icon_' + orderItem.product?.format + '.svg'"
-                  alt="format icon"
-                  />
-              }
-              <span>{{ orderItem.product?.formatDetail }}</span>
+              {{ rewardPoints$ | async | number: '1.0-0' }} Lesepunkte
             </div>
-          </div>
-        }
-        @if (!!orderItem.product?.ean) {
-          <div class="detail">
-            <div class="label">ISBN/EAN</div>
-            <div class="value">{{ orderItem.product?.ean }}</div>
-          </div>
-        }
-        @if (orderItem.price !== undefined) {
-          <div class="detail">
+          } @else {
             <div class="label">Preis</div>
             <div class="value">{{ orderItem.price | currency: 'EUR' }}</div>
-          </div>
-        }
-        @if (!!orderItem.retailPrice?.vat?.inPercent) {
-          <div class="detail">
-            <div class="label">MwSt</div>
-            <div class="value">{{ orderItem.retailPrice?.vat?.inPercent }}%</div>
-          </div>
-        }
-        <hr class="border-[#EDEFF0] border-t-2 my-4" />
-        @if (orderItem.supplier) {
-          <div class="detail">
-            <div class="label">Lieferant</div>
-            <div class="value">{{ orderItem.supplier }}</div>
-            @if (!expanded) {
-              <button
-                (click)="expanded = !expanded"
-                type="button"
-                class="page-pickup-shelf-details-item__more text-[#0556B4] font-bold flex flex-row items-center justify-center"
-                [class.flex-row-reverse]="!expanded"
-                >
-                <shared-icon class="mr-1" icon="arrow-back" [size]="20" [class.ml-1]="!expanded" [class.rotate-180]="!expanded"></shared-icon>
-                {{ expanded ? 'Weniger' : 'Mehr' }}
-              </button>
-            }
-          </div>
-        }
-        @if (!!orderItem.ssc || !!orderItem.sscText) {
-          <div class="detail">
-            <div class="label">Meldenummer</div>
-            <div class="value">{{ orderItem.ssc }} - {{ orderItem.sscText }}</div>
-          </div>
-        }
-        @if (expanded) {
-          @if (!!orderItem.targetBranch) {
-            <div class="detail">
-              <div class="label">Zielfiliale</div>
-              <div class="value">{{ orderItem.targetBranch }}</div>
-            </div>
           }
-          <div class="detail">
-            <div class="label">
-              @if (
-                orderItemFeature(orderItem) === 'Versand' ||
-                orderItemFeature(orderItem) === 'B2B-Versand' ||
-                orderItemFeature(orderItem) === 'DIG-Versand'
-                ) {
-                {{ orderItem?.estimatedDelivery ? 'Lieferung zwischen' : 'Lieferung ab' }}
-              }
-              @if (orderItemFeature(orderItem) === 'Abholung' || orderItemFeature(orderItem) === 'Rücklage') {
-                Abholung ab
-              }
-            </div>
-            @if (!!orderItem?.estimatedDelivery || !!orderItem?.estimatedShippingDate) {
-              <div class="value bg-[#D8DFE5] rounded w-max px-2">
-                @if (!!orderItem?.estimatedDelivery) {
-                  {{ orderItem?.estimatedDelivery?.start | date: 'dd.MM.yy' }} und
-                  {{ orderItem?.estimatedDelivery?.stop | date: 'dd.MM.yy' }}
-                } @else {
-                  @if (!!orderItem?.estimatedShippingDate) {
-                    {{ orderItem?.estimatedShippingDate | date: 'dd.MM.yy' }}
-                  }
-                }
-              </div>
-            }
-          </div>
-          <hr class="border-[#EDEFF0] border-t-2 my-4" />
-          @if (!!orderItem?.compartmentCode) {
-            <div class="detail">
-              <div class="label">Abholfachnr.</div>
-              <div class="value">{{ orderItem?.compartmentCode }}</div>
-            </div>
-          }
-          <div class="detail">
-            <div class="label">Vormerker</div>
-            <div class="value">{{ orderItem.isPrebooked ? 'Ja' : 'Nein' }}</div>
-          </div>
-          <hr class="border-[#EDEFF0] border-t-2 my-4" />
-          @if (!!orderItem.paymentProcessing) {
-            <div class="detail">
-              <div class="label">Zahlungsweg</div>
-              <div class="value">{{ orderItem.paymentProcessing || '-' }}</div>
-            </div>
-          }
-          @if (!!orderItem.paymentType) {
-            <div class="detail">
-              <div class="label">Zahlungsart</div>
-              <div class="value">{{ orderItem.paymentType | paymentType }}</div>
-            </div>
-          }
-          @if (receiptCount$ | async; as count) {
-            <h4 class="receipt-header">
-              {{ count > 1 ? 'Belege' : 'Beleg' }}
-            </h4>
-          }
-          @for (receipt of receipts$ | async; track receipt) {
-            @if (!!receipt?.receiptNumber) {
-              <div class="detail">
-                <div class="label">Belegnummer</div>
-                <div class="value">{{ receipt?.receiptNumber }}</div>
-              </div>
-            }
-            @if (!!receipt?.printedDate) {
-              <div class="detail">
-                <div class="label">Erstellt am</div>
-                <div class="value">{{ receipt?.printedDate | date: 'dd.MM.yy | HH:mm' }} Uhr</div>
-              </div>
-            }
-            @if (!!receipt?.receiptText) {
-              <div class="detail">
-                <div class="label">Rechnungstext</div>
-                <div class="value">{{ receipt?.receiptText || '-' }}</div>
-              </div>
-            }
-            @if (!!receipt?.receiptType) {
-              <div class="detail">
-                <div class="label">Belegart</div>
-                <div class="value">
-                  {{ receipt?.receiptType === 1 ? 'Lieferschein' : receipt?.receiptType === 64 ? 'Zahlungsbeleg' : '-' }}
-                </div>
-              </div>
-            }
-          }
-          @if (!!orderItem.paymentProcessing || !!orderItem.paymentType || !!(receiptCount$ | async)) {
-            <hr
-              class="border-[#EDEFF0] border-t-2 my-4"
-              />
-          }
-          @if (expanded) {
+        </div>
+      }
+      @if (!!orderItem.retailPrice?.vat?.inPercent) {
+        <div class="detail">
+          <div class="label">MwSt</div>
+          <div class="value">{{ orderItem.retailPrice?.vat?.inPercent }}%</div>
+        </div>
+      }
+      <hr class="border-[#EDEFF0] border-t-2 my-4" />
+      @if (orderItem.supplier) {
+        <div class="detail">
+          <div class="label">Lieferant</div>
+          <div class="value">{{ orderItem.supplier }}</div>
+          @if (!expanded) {
             <button
               (click)="expanded = !expanded"
               type="button"
-              class="page-pickup-shelf-details-item__less text-[#0556B4] font-bold flex flex-row items-center justify-center"
-              >
-              <shared-icon class="mr-1" icon="arrow-back" [size]="20"></shared-icon>
-              Weniger
+              class="page-pickup-shelf-details-item__more text-[#0556B4] font-bold flex flex-row items-center justify-center"
+              [class.flex-row-reverse]="!expanded"
+            >
+              <shared-icon
+                class="mr-1"
+                icon="arrow-back"
+                [size]="20"
+                [class.ml-1]="!expanded"
+                [class.rotate-180]="!expanded"
+              ></shared-icon>
+              {{ expanded ? 'Weniger' : 'Mehr' }}
             </button>
           }
+        </div>
+      }
+      @if (!!orderItem.ssc || !!orderItem.sscText) {
+        <div class="detail">
+          <div class="label">Meldenummer</div>
+          <div class="value">{{ orderItem.ssc }} - {{ orderItem.sscText }}</div>
+        </div>
+      }
+      @if (expanded) {
+        @if (!!orderItem.targetBranch) {
+          <div class="detail">
+            <div class="label">Zielfiliale</div>
+            <div class="value">{{ orderItem.targetBranch }}</div>
+          </div>
         }
-        <div class="page-pickup-shelf-details-item__comment flex flex-col items-start mt-[1.625rem]">
-          <div class="label mb-[0.375rem]">Anmerkung</div>
-          <div class="flex flex-row w-full">
-            <textarea
-              matInput
-              cdkTextareaAutosize
-              #autosize="cdkTextareaAutosize"
-              cdkAutosizeMinRows="1"
-              cdkAutosizeMaxRows="5"
-              maxlength="200"
-              #specialCommentInput
-              (keydown.delete)="triggerResize()"
-              (keydown.backspace)="triggerResize()"
-              type="text"
-              name="comment"
-              placeholder="Eine Anmerkung hinzufügen"
-              [formControl]="specialCommentControl"
-              [class.inactive]="!specialCommentControl.dirty"
-            ></textarea>
-            <div class="comment-actions">
-              @if (!!specialCommentControl.value?.length) {
-                <button
-                  type="reset"
-                  class="clear"
-                  (click)="specialCommentControl.setValue(''); saveSpecialComment(); triggerResize()"
-                  >
-                  <shared-icon icon="close" [size]="24"></shared-icon>
-                </button>
-              }
-              @if (specialCommentControl?.enabled && specialCommentControl.dirty) {
-                <button
-                  class="cta-save"
-                  type="submit"
-                  (click)="saveSpecialComment()"
-                  matomoClickCategory="pickup-shelf-details-item"
-                  matomoClickAction="save"
-                  matomoClickName="special-comment"
-                  >
-                  Speichern
-                </button>
+        <div class="detail">
+          <div class="label">
+            @if (
+              orderItemFeature(orderItem) === 'Versand' ||
+              orderItemFeature(orderItem) === 'B2B-Versand' ||
+              orderItemFeature(orderItem) === 'DIG-Versand'
+            ) {
+              {{
+                orderItem?.estimatedDelivery
+                  ? 'Lieferung zwischen'
+                  : 'Lieferung ab'
+              }}
+            }
+            @if (
+              orderItemFeature(orderItem) === 'Abholung' ||
+              orderItemFeature(orderItem) === 'Rücklage'
+            ) {
+              Abholung ab
+            }
+          </div>
+          @if (
+            !!orderItem?.estimatedDelivery || !!orderItem?.estimatedShippingDate
+          ) {
+            <div class="value bg-[#D8DFE5] rounded w-max px-2">
+              @if (!!orderItem?.estimatedDelivery) {
+                {{ orderItem?.estimatedDelivery?.start | date: 'dd.MM.yy' }} und
+                {{ orderItem?.estimatedDelivery?.stop | date: 'dd.MM.yy' }}
+              } @else {
+                @if (!!orderItem?.estimatedShippingDate) {
+                  {{ orderItem?.estimatedShippingDate | date: 'dd.MM.yy' }}
+                }
               }
             </div>
+          }
+        </div>
+        <hr class="border-[#EDEFF0] border-t-2 my-4" />
+        @if (!!orderItem?.compartmentCode) {
+          <div class="detail">
+            <div class="label">Abholfachnr.</div>
+            <div class="value">{{ orderItem?.compartmentCode }}</div>
+          </div>
+        }
+        <div class="detail">
+          <div class="label">Vormerker</div>
+          <div class="value">{{ orderItem.isPrebooked ? 'Ja' : 'Nein' }}</div>
+        </div>
+        <hr class="border-[#EDEFF0] border-t-2 my-4" />
+        @if (!!orderItem.paymentProcessing) {
+          <div class="detail">
+            <div class="label">Zahlungsweg</div>
+            <div class="value">{{ orderItem.paymentProcessing || '-' }}</div>
+          </div>
+        }
+        @if (!!orderItem.paymentType) {
+          <div class="detail">
+            <div class="label">Zahlungsart</div>
+            <div class="value">{{ orderItem.paymentType | paymentType }}</div>
+          </div>
+        }
+        @if (receiptCount$ | async; as count) {
+          <h4 class="receipt-header">
+            {{ count > 1 ? 'Belege' : 'Beleg' }}
+          </h4>
+        }
+        @for (receipt of receipts$ | async; track receipt) {
+          @if (!!receipt?.receiptNumber) {
+            <div class="detail">
+              <div class="label">Belegnummer</div>
+              <div class="value">{{ receipt?.receiptNumber }}</div>
+            </div>
+          }
+          @if (!!receipt?.printedDate) {
+            <div class="detail">
+              <div class="label">Erstellt am</div>
+              <div class="value">
+                {{ receipt?.printedDate | date: 'dd.MM.yy | HH:mm' }} Uhr
+              </div>
+            </div>
+          }
+          @if (!!receipt?.receiptText) {
+            <div class="detail">
+              <div class="label">Rechnungstext</div>
+              <div class="value">{{ receipt?.receiptText || '-' }}</div>
+            </div>
+          }
+          @if (!!receipt?.receiptType) {
+            <div class="detail">
+              <div class="label">Belegart</div>
+              <div class="value">
+                {{
+                  receipt?.receiptType === 1
+                    ? 'Lieferschein'
+                    : receipt?.receiptType === 64
+                      ? 'Zahlungsbeleg'
+                      : '-'
+                }}
+              </div>
+            </div>
+          }
+        }
+        @if (
+          !!orderItem.paymentProcessing ||
+          !!orderItem.paymentType ||
+          !!(receiptCount$ | async)
+        ) {
+          <hr class="border-[#EDEFF0] border-t-2 my-4" />
+        }
+        @if (expanded) {
+          <button
+            (click)="expanded = !expanded"
+            type="button"
+            class="page-pickup-shelf-details-item__less text-[#0556B4] font-bold flex flex-row items-center justify-center"
+          >
+            <shared-icon
+              class="mr-1"
+              icon="arrow-back"
+              [size]="20"
+            ></shared-icon>
+            Weniger
+          </button>
+        }
+      }
+      <div
+        class="page-pickup-shelf-details-item__comment flex flex-col items-start mt-[1.625rem]"
+      >
+        <div class="label mb-[0.375rem]">Anmerkung</div>
+        <div class="flex flex-row w-full">
+          <textarea
+            matInput
+            cdkTextareaAutosize
+            #autosize="cdkTextareaAutosize"
+            cdkAutosizeMinRows="1"
+            cdkAutosizeMaxRows="5"
+            maxlength="200"
+            #specialCommentInput
+            (keydown.delete)="triggerResize()"
+            (keydown.backspace)="triggerResize()"
+            type="text"
+            name="comment"
+            placeholder="Eine Anmerkung hinzufügen"
+            [formControl]="specialCommentControl"
+            [class.inactive]="!specialCommentControl.dirty"
+          ></textarea>
+          <div class="comment-actions">
+            @if (!!specialCommentControl.value?.length) {
+              <button
+                type="reset"
+                class="clear"
+                (click)="
+                  specialCommentControl.setValue('');
+                  saveSpecialComment();
+                  triggerResize()
+                "
+              >
+                <shared-icon icon="close" [size]="24"></shared-icon>
+              </button>
+            }
+            @if (
+              specialCommentControl?.enabled && specialCommentControl.dirty
+            ) {
+              <button
+                class="cta-save"
+                type="submit"
+                (click)="saveSpecialComment()"
+                matomoClickCategory="pickup-shelf-details-item"
+                matomoClickAction="save"
+                matomoClickName="special-comment"
+              >
+                Speichern
+              </button>
+            }
           </div>
         </div>
       </div>
     </div>
-  }
+  </div>
+}

apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-item/pickup-shelf-details-item.component.scss

@@ -21,6 +21,8 @@ button {
 }
 
 .page-pickup-shelf-details-item__thumbnail {
+  @apply flex flex-col items-center gap-2;
+
   img {
     @apply rounded shadow-cta w-[3.625rem] max-h-[5.9375rem];
   }

apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-details-item/pickup-shelf-details-item.component.ts

@@ -1,20 +1,38 @@
 import { CdkTextareaAutosize, TextFieldModule } from '@angular/cdk/text-field';
-import { AsyncPipe, CurrencyPipe, DatePipe } from '@angular/common';
+import {
+  AsyncPipe,
+  CurrencyPipe,
+  DatePipe,
+  DecimalPipe,
+} from '@angular/common';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
   EventEmitter,
   Input,
-  OnInit,
   Output,
   ViewChild,
-  inject, OnDestroy,
+  inject,
+  OnDestroy,
 } from '@angular/core';
-import { FormsModule, ReactiveFormsModule, UntypedFormControl } from '@angular/forms';
-import { NavigateOnClickDirective, ProductImageModule } from '@cdn/product-image';
-import { DBHOrderItemListItemDTO, OrderDTO, ReceiptDTO } from '@generated/swagger/oms-api';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+} from '@angular/forms';
+import {
+  NavigateOnClickDirective,
+  ProductImageModule,
+} from '@cdn/product-image';
+import {
+  DBHOrderItemListItemDTO,
+  OrderDTO,
+  ReceiptDTO,
+} from '@generated/swagger/oms-api';
+import { getOrderItemRewardFeature } from '@isa/oms/data-access';
 import { UiCommonModule } from '@ui/common';
+import { LabelComponent } from '@isa/ui/label';
 import { UiTooltipModule } from '@ui/tooltip';
 import { PickupShelfPaymentTypePipe } from '../pipes/payment-type.pipe';
 import { IconModule } from '@shared/components/icon';
@@ -48,6 +66,7 @@ export interface PickUpShelfDetailsItemComponentState {
     ReactiveFormsModule,
     CurrencyPipe,
     DatePipe,
+    DecimalPipe,
     AsyncPipe,
     ProductImageModule,
     TextFieldModule,
@@ -56,12 +75,13 @@ export interface PickUpShelfDetailsItemComponentState {
     UiQuantityDropdownModule,
     NotificationTypePipe,
     NavigateOnClickDirective,
-    MatomoModule
-],
+    MatomoModule,
+    LabelComponent,
+  ],
 })
 export class PickUpShelfDetailsItemComponent
   extends ComponentStore<PickUpShelfDetailsItemComponentState>
-  implements OnInit, OnDestroy
+  implements OnDestroy
 {
   private _store = inject(PickupShelfDetailsStore);
 
@@ -84,7 +104,11 @@ export class PickUpShelfDetailsItemComponent
         this._store.selectOrderItem(this.orderItem, false);
       }
 
-      this.patchState({ orderItem, quantity: orderItem?.quantity, more: false });
+      this.patchState({
+        orderItem,
+        quantity: orderItem?.quantity,
+        more: false,
+      });
       this.specialCommentControl.reset(orderItem?.specialComment);
       // Add New OrderItem to selected list if selected was set to true by its input
       if (this.get((s) => s.selected)) {
@@ -106,19 +130,50 @@ export class PickUpShelfDetailsItemComponent
   readonly orderItem$ = this.select((s) => s.orderItem);
 
   emailNotificationDates$ = this.orderItem$.pipe(
-    switchMap((orderItem) => this._store.getEmailNotificationDate$(orderItem?.orderItemSubsetId)),
+    switchMap((orderItem) =>
+      this._store.getEmailNotificationDate$(orderItem?.orderItemSubsetId),
+    ),
   );
 
-  hasEmailNotification$ = this.emailNotificationDates$.pipe(map((dates) => dates?.length > 0));
+  hasEmailNotification$ = this.emailNotificationDates$.pipe(
+    map((dates) => dates?.length > 0),
+  );
 
   smsNotificationDates$ = this.orderItem$.pipe(
-    switchMap((orderItem) => this._store.getSmsNotificationDate$(orderItem?.orderItemSubsetId)),
+    switchMap((orderItem) =>
+      this._store.getSmsNotificationDate$(orderItem?.orderItemSubsetId),
+    ),
   );
 
-  hasSmsNotification$ = this.smsNotificationDates$.pipe(map((dates) => dates?.length > 0));
+  hasSmsNotification$ = this.smsNotificationDates$.pipe(
+    map((dates) => dates?.length > 0),
+  );
 
-  canChangeQuantity$ = combineLatest([this.orderItem$, this._store.fetchPartial$]).pipe(
-    map(([item, partialPickup]) => ([16, 8192].includes(item?.processingStatus) || partialPickup) && item.quantity > 1),
+  /**
+   * Observable that indicates whether the order item has reward points (Lesepunkte).
+   * Returns true if the item has a 'praemie' feature.
+   */
+  hasRewardPoints$ = this.orderItem$.pipe(
+    map((orderItem) => getOrderItemRewardFeature(orderItem) !== undefined),
+  );
+
+  /**
+   * Observable that emits the reward points (Lesepunkte) value for the order item.
+   * Returns the parsed numeric value from the 'praemie' feature, or undefined if not present.
+   */
+  rewardPoints$ = this.orderItem$.pipe(
+    map((orderItem) => getOrderItemRewardFeature(orderItem)),
+  );
+
+  canChangeQuantity$ = combineLatest([
+    this.orderItem$,
+    this._store.fetchPartial$,
+  ]).pipe(
+    map(
+      ([item, partialPickup]) =>
+        ([16, 8192].includes(item?.processingStatus) || partialPickup) &&
+        item.quantity > 1,
+    ),
   );
 
   get quantity() {
@@ -127,7 +182,10 @@ export class PickUpShelfDetailsItemComponent
   set quantity(quantity: number) {
     if (this.quantity !== quantity) {
       this.patchState({ quantity });
-      this._store.setSelectedOrderItemQuantity({ orderItemSubsetId: this.orderItem.orderItemSubsetId, quantity });
+      this._store.setSelectedOrderItemQuantity({
+        orderItemSubsetId: this.orderItem.orderItemSubsetId,
+        quantity,
+      });
     }
   }
 
@@ -135,7 +193,9 @@ export class PickUpShelfDetailsItemComponent
 
   @Input()
   get selected() {
-    return this._store.selectedOrderItemIds.includes(this.orderItem?.orderItemSubsetId);
+    return this._store.selectedOrderItemIds.includes(
+      this.orderItem?.orderItemSubsetId,
+    );
   }
   set selected(selected: boolean) {
     if (this.selected !== selected) {
@@ -144,36 +204,55 @@ export class PickUpShelfDetailsItemComponent
     }
   }
 
-  readonly selected$ = combineLatest([this.orderItem$, this._store.selectedOrderItemIds$]).pipe(
-    map(([orderItem, selectedItems]) => selectedItems.includes(orderItem?.orderItemSubsetId)),
+  readonly selected$ = combineLatest([
+    this.orderItem$,
+    this._store.selectedOrderItemIds$,
+  ]).pipe(
+    map(([orderItem, selectedItems]) =>
+      selectedItems.includes(orderItem?.orderItemSubsetId),
+    ),
   );
 
   @Output()
   selectedChange = new EventEmitter<boolean>();
 
   get isItemSelectable() {
-    return this._store.orderItems?.some((item) => !!item?.actions && item?.actions?.length > 0);
+    return this._store.orderItems?.some(
+      (item) => !!item?.actions && item?.actions?.length > 0,
+    );
   }
 
   get selectable() {
-    return this.isItemSelectable && this._store.orderItems.length > 1 && this._store.fetchPartial;
+    return (
+      this.isItemSelectable &&
+      this._store.orderItems.length > 1 &&
+      this._store.fetchPartial
+    );
   }
 
-  readonly selectable$ = combineLatest([this._store.orderItems$, this._store.fetchPartial$]).pipe(
-    map(([orderItems, fetchPartial]) => orderItems.length > 1 && this.isItemSelectable && fetchPartial),
+  readonly selectable$ = combineLatest([
+    this._store.orderItems$,
+    this._store.fetchPartial$,
+  ]).pipe(
+    map(
+      ([orderItems, fetchPartial]) =>
+        orderItems.length > 1 && this.isItemSelectable && fetchPartial,
+    ),
   );
 
   get receipts() {
     return this._store.receipts;
   }
 
-  readonly receipts$ = this._store.receipts$;
-
   set receipts(receipts: ReceiptDTO[]) {
     this._store.updateReceipts(receipts);
   }
 
-  readonly receiptCount$ = this.receipts$.pipe(map((receipts) => receipts?.length));
+  readonly receipts$ = this._store.receipts$;
+
+  readonly receiptCount$ = this.receipts$.pipe(
+    map((receipts) => receipts?.length),
+  );
 
   specialCommentControl = new UntypedFormControl();
 
@@ -181,7 +260,7 @@ export class PickUpShelfDetailsItemComponent
 
   private _onDestroy$ = new Subject<void>();
 
-  expanded: boolean = false;
+  expanded = false;
 
   constructor(private _cdr: ChangeDetectorRef) {
     super({
@@ -189,8 +268,6 @@ export class PickUpShelfDetailsItemComponent
     });
   }
 
-  ngOnInit() {}
-
   ngOnDestroy() {
     // Remove Prev OrderItem from selected list
     this._store.selectOrderItem(this.orderItem, false);
@@ -217,8 +294,9 @@ export class PickUpShelfDetailsItemComponent
 
   orderItemFeature(orderItemListItem: DBHOrderItemListItemDTO) {
     const orderItems = this.order?.items;
-    return orderItems?.find((orderItem) => orderItem.data.id === orderItemListItem.orderItemId)?.data?.features
-      ?.orderType;
+    return orderItems?.find(
+      (orderItem) => orderItem.data.id === orderItemListItem.orderItemId,
+    )?.data?.features?.orderType;
   }
 
   triggerResize() {

apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-list-item/pickup-shelf-list-item.component.css

@@ -39,6 +39,7 @@
 
 .page-pickup-shelf-list-item__item-thumbnail {
   grid-area: thumbnail;
+  @apply flex flex-col items-center gap-2;
 }
 
 .page-pickup-shelf-list-item__item-image {

apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-list-item/pickup-shelf-list-item.component.html

@@ -4,13 +4,17 @@
   [routerLinkActive]="!isTablet && !primaryOutletActive ? 'active' : ''"
   queryParamsHandling="preserve"
   (click)="onDetailsClick()"
-  >
+>
   <div
     class="page-pickup-shelf-list-item__item-grid-container"
-    [class.page-pickup-shelf-list-item__item-grid-container-main]="primaryOutletActive"
-    [class.page-pickup-shelf-list-item__item-grid-container-secondary]="primaryOutletActive && isItemSelectable === undefined"
-    >
-    <div class="page-pickup-shelf-list-item__item-thumbnail text-center w-[3.125rem] h-[4.9375rem]">
+    [class.page-pickup-shelf-list-item__item-grid-container-main]="
+      primaryOutletActive
+    "
+    [class.page-pickup-shelf-list-item__item-grid-container-secondary]="
+      primaryOutletActive && isItemSelectable === undefined
+    "
+  >
+    <div class="page-pickup-shelf-list-item__item-thumbnail text-center">
       @if (item?.product?.ean | productImage; as productImage) {
         <img
           class="page-pickup-shelf-list-item__item-image w-[3.125rem] max-h-[4.9375rem]"
@@ -18,83 +22,126 @@
           [productImageNavigation]="item?.product?.ean"
           [src]="productImage"
           [alt]="item?.product?.name"
-          />
+        />
       }
     </div>
 
     <div
       class="page-pickup-shelf-list-item__item-title-contributors flex flex-col"
-      [class.mr-32]="showCompartmentCode && item.features?.paid && (isTablet || isDesktopSmall || primaryOutletActive)"
-      >
+      [class.mr-32]="
+        showCompartmentCode &&
+        item.features?.paid &&
+        (isTablet || isDesktopSmall || primaryOutletActive)
+      "
+    >
+      @if (hasRewardPoints) {
+        <ui-label class="w-10 mb-2">Prämie</ui-label>
+      }
+
       <div
         class="page-pickup-shelf-list-item__item-contributors text-p2 font-normal text-ellipsis overflow-hidden max-w-[24rem] whitespace-nowrap mb-[0.375rem]"
-        >
-        @for (contributor of contributors; track contributor; let last = $last) {
+      >
+        @for (
+          contributor of contributors;
+          track contributor;
+          let last = $last
+        ) {
           {{ contributor }}{{ last ? '' : ';' }}
         }
       </div>
 
       <div
         class="page-pickup-shelf-list-item__item-title font-bold text-p1 desktop-small:text-p2"
-        [class.page-pickup-shelf-list-item__item-title-bigger-text-size]="!primaryOutletActive"
-        >
+        [class.page-pickup-shelf-list-item__item-title-bigger-text-size]="
+          !primaryOutletActive
+        "
+      >
         {{ item?.product?.name }}
       </div>
     </div>
 
-    <div class="page-pickup-shelf-list-item__item-ean-quantity-changed flex flex-col">
-      <div class="page-pickup-shelf-list-item__item-ean text-p2 flex flex-row mb-[0.375rem]" [attr.data-ean]="item?.product?.ean">
+    <div
+      class="page-pickup-shelf-list-item__item-ean-quantity-changed flex flex-col"
+    >
+      <div
+        class="page-pickup-shelf-list-item__item-ean text-p2 flex flex-row mb-[0.375rem]"
+        [attr.data-ean]="item?.product?.ean"
+      >
         <div class="min-w-[7.5rem]">EAN</div>
         <div class="font-bold">{{ item?.product?.ean }}</div>
       </div>
 
-      <div class="page-pickup-shelf-list-item__item-quantity flex flex-row text-p2 mb-[0.375rem]" [attr.data-menge]="item.quantity">
+      <div
+        class="page-pickup-shelf-list-item__item-quantity flex flex-row text-p2 mb-[0.375rem]"
+        [attr.data-menge]="item.quantity"
+      >
         <div class="min-w-[7.5rem]">Menge</div>
         <div class="font-bold">{{ item.quantity }} x</div>
       </div>
 
-      <div class="page-pickup-shelf-list-item__item-changed text-p2" [attr.data-geaendert]="item?.processingStatusDate">
+      <div
+        class="page-pickup-shelf-list-item__item-changed text-p2"
+        [attr.data-geaendert]="item?.processingStatusDate"
+      >
         @if (showChangeDate) {
           <div class="flex flex-row">
             <div class="min-w-[7.5rem]">Geändert</div>
-            <div class="font-bold">{{ item?.processingStatusDate | date: 'dd.MM.yy | HH:mm' }} Uhr</div>
+            <div class="font-bold">
+              {{ item?.processingStatusDate | date: 'dd.MM.yy | HH:mm' }} Uhr
+            </div>
           </div>
         } @else {
           <div class="flex flex-row" [attr.data-bestelldatum]="item?.orderDate">
             <div class="min-w-[7.5rem]">Bestelldatum</div>
-            <div class="font-bold">{{ item?.orderDate | date: 'dd.MM.yy | HH:mm' }} Uhr</div>
+            <div class="font-bold">
+              {{ item?.orderDate | date: 'dd.MM.yy | HH:mm' }} Uhr
+            </div>
           </div>
         }
       </div>
     </div>
 
-    <div class="page-pickup-shelf-list-item__item-order-number-processing-status-paid flex flex-col">
+    <div
+      class="page-pickup-shelf-list-item__item-order-number-processing-status-paid flex flex-col"
+    >
       @if (showCompartmentCode) {
         <div
           class="page-pickup-shelf-list-item__item-order-number text-h3 mb-[0.375rem] self-end font-bold break-all text-right"
           [attr.data-compartment-code]="item?.compartmentCode"
           [attr.data-compartment-info]="item?.compartmentInfo"
-          >
-          {{ item?.compartmentCode }}{{ item?.compartmentInfo && '_' + item?.compartmentInfo }}
+        >
+          {{ item?.compartmentCode
+          }}{{ item?.compartmentInfo && '_' + item?.compartmentInfo }}
         </div>
       }
 
-      <div class="page-pickup-shelf-list-item__item-processing-paid-status flex flex-col font-bold self-end text-p2 mb-[0.375rem]">
+      <div
+        class="page-pickup-shelf-list-item__item-processing-paid-status flex flex-col font-bold self-end text-p2 mb-[0.375rem]"
+      >
         <div
           class="page-pickup-shelf-list-item__item-processing-status flex flex-row mb-[0.375rem] rounded p-3 py-[0.125rem] text-white"
           [style]="processingStatusColor"
           [attr.data-processing-status]="item.processingStatus"
-          >
+        >
           {{ item.processingStatus | processingStatus }}
         </div>
 
-        <div class="page-pickup-shelf-list-item__item-paid self-end flex flex-row">
-          @if (item.features?.paid && (isTablet || isDesktopSmall || primaryOutletActive)) {
+        <div
+          class="page-pickup-shelf-list-item__item-paid self-end flex flex-row"
+        >
+          @if (
+            item.features?.paid &&
+            (isTablet || isDesktopSmall || primaryOutletActive)
+          ) {
             <div
               class="font-bold flex flex-row items-center justify-center text-p2 text-[#26830C]"
               [attr.data-paid]="item.features?.paid"
-              >
-              <shared-icon class="flex items-center justify-center mr-[0.375rem]" [size]="24" icon="credit-card"></shared-icon>
+            >
+              <shared-icon
+                class="flex items-center justify-center mr-[0.375rem]"
+                [size]="24"
+                icon="credit-card"
+              ></shared-icon>
               {{ item.features?.paid }}
             </div>
           }
@@ -105,28 +152,35 @@
     @if (isItemSelectable) {
       <div
         class="page-pickup-shelf-list-item__item-select-bullet justify-self-end self-center mb-2"
-        [class.page-pickup-shelf-list-item__item-select-bullet-primary]="primaryOutletActive"
-        >
+        [class.page-pickup-shelf-list-item__item-select-bullet-primary]="
+          primaryOutletActive
+        "
+      >
         <input
           (click)="$event.stopPropagation()"
           [ngModel]="selectedItem"
-        (ngModelChange)="
-          setSelected();
-          tracker.trackEvent({ category: 'pickup-shelf-list-item', action: 'select', name: item?.product?.name, value: $event ? 1 : 0 })
-        "
+          (ngModelChange)="
+            setSelected();
+            tracker.trackEvent({
+              category: 'pickup-shelf-list-item',
+              action: 'select',
+              name: item?.product?.name,
+              value: $event ? 1 : 0,
+            })
+          "
           class="isa-select-bullet"
           type="checkbox"
           matomoTracker
           #tracker="matomo"
-          />
-        </div>
-      }
-
-      <div
-        [attr.data-special-comment]="item?.specialComment"
-        class="page-pickup-shelf-list-item__item-special-comment break-words font-bold text-p2 mt-[0.375rem] text-[#996900]"
-        >
-        {{ item?.specialComment }}
+        />
       </div>
+    }
+
+    <div
+      [attr.data-special-comment]="item?.specialComment"
+      class="page-pickup-shelf-list-item__item-special-comment break-words font-bold text-p2 mt-[0.375rem] text-[#996900]"
+    >
+      {{ item?.specialComment }}
     </div>
-  </a>
+  </div>
+</a>

apps/isa-app/src/page/pickup-shelf/shared/pickup-shelf-list-item/pickup-shelf-list-item.component.ts

@@ -1,10 +1,21 @@
 import { DatePipe } from '@angular/common';
-import { ChangeDetectionStrategy, Component, ElementRef, Input, inject } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ElementRef,
+  Input,
+  inject,
+} from '@angular/core';
 import { RouterLink, RouterLinkActive } from '@angular/router';
-import { NavigateOnClickDirective, ProductImageModule } from '@cdn/product-image';
+import {
+  NavigateOnClickDirective,
+  ProductImageModule,
+} from '@cdn/product-image';
 import { EnvironmentService } from '@core/environment';
 import { IconModule } from '@shared/components/icon';
 import { DBHOrderItemListItemDTO } from '@generated/swagger/oms-api';
+import { getOrderItemRewardFeature } from '@isa/oms/data-access';
+import { LabelComponent } from '@isa/ui/label';
 import { UiCommonModule } from '@ui/common';
 import { PickupShelfProcessingStatusPipe } from '../pipes/processing-status.pipe';
 import { FormsModule } from '@angular/forms';
@@ -29,8 +40,9 @@ import { MatomoModule } from 'ngx-matomo-client';
     UiCommonModule,
     PickupShelfProcessingStatusPipe,
     NavigateOnClickDirective,
-    MatomoModule
-],
+    MatomoModule,
+    LabelComponent,
+  ],
   providers: [PickupShelfProcessingStatusPipe],
 })
 export class PickUpShelfListItemComponent {
@@ -42,6 +54,7 @@ export class PickUpShelfListItemComponent {
 
   @Input() primaryOutletActive = false;
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   @Input() itemDetailsLink: any[] = [];
 
   @Input() isItemSelectable?: boolean = undefined;
@@ -61,7 +74,9 @@ export class PickUpShelfListItemComponent {
   }
 
   get contributors() {
-    return this.item?.product?.contributors?.split(';').map((val) => val.trim());
+    return this.item?.product?.contributors
+      ?.split(';')
+      .map((val) => val.trim());
   }
 
   get showChangeDate() {
@@ -70,16 +85,34 @@ export class PickUpShelfListItemComponent {
 
   // Zeige nur CompartmentCode an wenn verfügbar
   get showCompartmentCode() {
-    return !!this.item?.compartmentCode && (this.isTablet || this.isDesktopSmall || this.primaryOutletActive);
+    return (
+      !!this.item?.compartmentCode &&
+      (this.isTablet || this.isDesktopSmall || this.primaryOutletActive)
+    );
   }
 
   get processingStatusColor() {
-    return { 'background-color': this._processingStatusPipe.transform(this.item?.processingStatus, true) };
+    return {
+      'background-color': this._processingStatusPipe.transform(
+        this.item?.processingStatus,
+        true,
+      ),
+    };
+  }
+
+  /**
+   * Indicates whether the order item has reward points (Lesepunkte).
+   * Returns true if the item has a 'praemie' feature.
+   */
+  get hasRewardPoints() {
+    return getOrderItemRewardFeature(this.item) !== undefined;
   }
 
   selected$ = this.store.selectedListItems$.pipe(
     map((selectedListItems) =>
-      selectedListItems?.find((item) => item?.orderItemSubsetId === this.item?.orderItemSubsetId),
+      selectedListItems?.find(
+        (item) => item?.orderItemSubsetId === this.item?.orderItemSubsetId,
+      ),
     ),
   );
 
@@ -110,7 +143,9 @@ export class PickUpShelfListItemComponent {
         store: 'PickupShelfDetailsStore',
       })) ?? [];
 
-    return items.some((i) => i.orderItemSubsetId === this.item.orderItemSubsetId);
+    return items.some(
+      (i) => i.orderItemSubsetId === this.item.orderItemSubsetId,
+    );
   }
 
   addOrderItemIntoCache() {
@@ -129,7 +164,10 @@ export class PickUpShelfListItemComponent {
   }
 
   scrollIntoView() {
-    this._elRef.nativeElement.scrollIntoView({ behavior: 'smooth', block: 'center' });
+    this._elRef.nativeElement.scrollIntoView({
+      behavior: 'smooth',
+      block: 'center',
+    });
   }
 
   setSelected() {

apps/isa-app/src/shared/services/navigation/customer-create.navigation.ts

@@ -6,7 +6,7 @@ import { NavigationRoute } from './defs/navigation-route';
 import {
   encodeFormData,
   mapCustomerInfoDtoToCustomerCreateFormData,
-} from 'apps/isa-app/src/page/customer';
+} from '@page/customer';
 
 @Injectable({ providedIn: 'root' })
 export class CustomerCreateNavigation {
@@ -58,7 +58,7 @@ export class CustomerCreateNavigation {
       },
     ];
 
-    let formData = params?.customerInfo
+    const formData = params?.customerInfo
       ? encodeFormData(
           mapCustomerInfoDtoToCustomerCreateFormData(params.customerInfo),
         )

apps/isa-app/src/tailwind.scss

@@ -20,6 +20,7 @@
   @import "../../../libs/ui/skeleton-loader/src/skeleton-loader.scss";
   @import "../../../libs/ui/tooltip/src/tooltip.scss";
   @import "../../../libs/ui/label/src/label.scss";
+  @import "../../../libs/ui/notice/src/notice.scss";
   @import "../../../libs/ui/switch/src/switch.scss";
 
   .input-control {

apps/isa-app/stories/shared/barcode/barcode-component.stories.ts

@@ -0,0 +1,214 @@
+import {
+  argsToTemplate,
+  type Meta,
+  type StoryObj,
+  moduleMetadata,
+} from '@storybook/angular';
+import { BarcodeComponent } from '@isa/shared/barcode';
+
+type BarcodeInputs = {
+  value: string;
+  format: string;
+  width: number;
+  height: number;
+  displayValue: boolean;
+  lineColor: string;
+  background: string;
+  fontSize: number;
+  margin: number;
+};
+
+const meta: Meta<BarcodeInputs> = {
+  title: 'shared/barcode/BarcodeComponent',
+
+  decorators: [
+    moduleMetadata({
+      imports: [BarcodeComponent],
+    }),
+  ],
+  argTypes: {
+    value: {
+      control: {
+        type: 'text',
+      },
+      description: 'The barcode value to encode',
+    },
+    format: {
+      control: {
+        type: 'select',
+      },
+      options: ['CODE128', 'CODE39', 'EAN13', 'EAN8', 'UPC'],
+      description: 'Barcode format',
+    },
+    width: {
+      control: {
+        type: 'number',
+        min: 1,
+        max: 10,
+      },
+      description: 'Width of a single bar in pixels',
+    },
+    height: {
+      control: {
+        type: 'number',
+        min: 20,
+        max: 300,
+      },
+      description: 'Height of the barcode in pixels',
+    },
+    displayValue: {
+      control: {
+        type: 'boolean',
+      },
+      description: 'Whether to display the human-readable text',
+    },
+    lineColor: {
+      control: {
+        type: 'color',
+      },
+      description: 'Color of the barcode bars and text',
+    },
+    background: {
+      control: {
+        type: 'color',
+      },
+      description: 'Background color',
+    },
+    fontSize: {
+      control: {
+        type: 'number',
+        min: 10,
+        max: 40,
+      },
+      description: 'Font size for the human-readable text',
+    },
+    margin: {
+      control: {
+        type: 'number',
+        min: 0,
+        max: 50,
+      },
+      description: 'Margin around the barcode in pixels',
+    },
+  },
+  render: (args) => ({
+    props: args,
+    template: `<shared-barcode ${argsToTemplate(args)} />`,
+  }),
+};
+
+export default meta;
+
+type Story = StoryObj<BarcodeComponent>;
+
+export const Default: Story = {
+  args: {
+    value: '123456789012',
+    format: 'CODE128',
+    width: 2,
+    height: 100,
+    displayValue: true,
+    lineColor: '#000000',
+    background: '#ffffff',
+    fontSize: 20,
+    margin: 10,
+  },
+};
+
+export const ProductEAN: Story = {
+  args: {
+    value: '9783161484100',
+    format: 'CODE128',
+    width: 2,
+    height: 100,
+    displayValue: true,
+    lineColor: '#000000',
+    background: '#ffffff',
+    fontSize: 20,
+    margin: 10,
+  },
+};
+
+export const CompactNoText: Story = {
+  args: {
+    value: '987654321',
+    format: 'CODE128',
+    width: 1,
+    height: 60,
+    displayValue: false,
+    lineColor: '#000000',
+    background: '#ffffff',
+    fontSize: 20,
+    margin: 5,
+  },
+};
+
+export const LargeBarcode: Story = {
+  args: {
+    value: 'WAREHOUSE2024',
+    format: 'CODE128',
+    width: 4,
+    height: 200,
+    displayValue: true,
+    lineColor: '#000000',
+    background: '#ffffff',
+    fontSize: 28,
+    margin: 20,
+  },
+};
+
+export const ColoredBarcode: Story = {
+  args: {
+    value: 'PRODUCT001',
+    format: 'CODE128',
+    width: 2,
+    height: 100,
+    displayValue: true,
+    lineColor: '#0066CC',
+    background: '#F0F8FF',
+    fontSize: 20,
+    margin: 10,
+  },
+};
+
+export const RedBarcode: Story = {
+  args: {
+    value: 'URGENT2024',
+    format: 'CODE128',
+    width: 3,
+    height: 120,
+    displayValue: true,
+    lineColor: '#CC0000',
+    background: '#FFEEEE',
+    fontSize: 22,
+    margin: 15,
+  },
+};
+
+export const MinimalMargin: Story = {
+  args: {
+    value: '1234567890',
+    format: 'CODE128',
+    width: 2,
+    height: 80,
+    displayValue: true,
+    lineColor: '#000000',
+    background: '#ffffff',
+    fontSize: 16,
+    margin: 0,
+  },
+};
+
+export const SmallFont: Story = {
+  args: {
+    value: '555123456789',
+    format: 'CODE128',
+    width: 2,
+    height: 100,
+    displayValue: true,
+    lineColor: '#000000',
+    background: '#ffffff',
+    fontSize: 12,
+    margin: 10,
+  },
+};

apps/isa-app/stories/shared/barcode/barcode.stories.ts

@@ -0,0 +1,214 @@
+import {
+  argsToTemplate,
+  type Meta,
+  type StoryObj,
+  moduleMetadata,
+} from '@storybook/angular';
+import { BarcodeDirective } from '@isa/shared/barcode';
+
+type BarcodeInputs = {
+  value: string;
+  format: string;
+  width: number;
+  height: number;
+  displayValue: boolean;
+  lineColor: string;
+  background: string;
+  fontSize: number;
+  margin: number;
+};
+
+const meta: Meta<BarcodeInputs> = {
+  title: 'shared/barcode/Barcode',
+
+  decorators: [
+    moduleMetadata({
+      imports: [BarcodeDirective],
+    }),
+  ],
+  argTypes: {
+    value: {
+      control: {
+        type: 'text',
+      },
+      description: 'The barcode value to encode',
+    },
+    format: {
+      control: {
+        type: 'select',
+      },
+      options: ['CODE128', 'CODE39', 'EAN13', 'EAN8', 'UPC'],
+      description: 'Barcode format',
+    },
+    width: {
+      control: {
+        type: 'number',
+        min: 1,
+        max: 10,
+      },
+      description: 'Width of a single bar in pixels',
+    },
+    height: {
+      control: {
+        type: 'number',
+        min: 20,
+        max: 300,
+      },
+      description: 'Height of the barcode in pixels',
+    },
+    displayValue: {
+      control: {
+        type: 'boolean',
+      },
+      description: 'Whether to display the human-readable text',
+    },
+    lineColor: {
+      control: {
+        type: 'color',
+      },
+      description: 'Color of the barcode bars and text',
+    },
+    background: {
+      control: {
+        type: 'color',
+      },
+      description: 'Background color',
+    },
+    fontSize: {
+      control: {
+        type: 'number',
+        min: 10,
+        max: 40,
+      },
+      description: 'Font size for the human-readable text',
+    },
+    margin: {
+      control: {
+        type: 'number',
+        min: 0,
+        max: 50,
+      },
+      description: 'Margin around the barcode in pixels',
+    },
+  },
+  render: (args) => ({
+    props: args,
+    template: `<svg sharedBarcode ${argsToTemplate(args)}></svg>`,
+  }),
+};
+
+export default meta;
+
+type Story = StoryObj<BarcodeDirective>;
+
+export const Default: Story = {
+  args: {
+    value: '123456789012',
+    format: 'CODE128',
+    width: 2,
+    height: 100,
+    displayValue: true,
+    lineColor: '#000000',
+    background: '#ffffff',
+    fontSize: 20,
+    margin: 10,
+  },
+};
+
+export const ProductEAN: Story = {
+  args: {
+    value: '9783161484100',
+    format: 'CODE128',
+    width: 2,
+    height: 100,
+    displayValue: true,
+    lineColor: '#000000',
+    background: '#ffffff',
+    fontSize: 20,
+    margin: 10,
+  },
+};
+
+export const CompactNoText: Story = {
+  args: {
+    value: '987654321',
+    format: 'CODE128',
+    width: 1,
+    height: 60,
+    displayValue: false,
+    lineColor: '#000000',
+    background: '#ffffff',
+    fontSize: 20,
+    margin: 5,
+  },
+};
+
+export const LargeBarcode: Story = {
+  args: {
+    value: 'WAREHOUSE2024',
+    format: 'CODE128',
+    width: 4,
+    height: 200,
+    displayValue: true,
+    lineColor: '#000000',
+    background: '#ffffff',
+    fontSize: 28,
+    margin: 20,
+  },
+};
+
+export const ColoredBarcode: Story = {
+  args: {
+    value: 'PRODUCT001',
+    format: 'CODE128',
+    width: 2,
+    height: 100,
+    displayValue: true,
+    lineColor: '#0066CC',
+    background: '#F0F8FF',
+    fontSize: 20,
+    margin: 10,
+  },
+};
+
+export const RedBarcode: Story = {
+  args: {
+    value: 'URGENT2024',
+    format: 'CODE128',
+    width: 3,
+    height: 120,
+    displayValue: true,
+    lineColor: '#CC0000',
+    background: '#FFEEEE',
+    fontSize: 22,
+    margin: 15,
+  },
+};
+
+export const MinimalMargin: Story = {
+  args: {
+    value: '1234567890',
+    format: 'CODE128',
+    width: 2,
+    height: 80,
+    displayValue: true,
+    lineColor: '#000000',
+    background: '#ffffff',
+    fontSize: 16,
+    margin: 0,
+  },
+};
+
+export const SmallFont: Story = {
+  args: {
+    value: '555123456789',
+    format: 'CODE128',
+    width: 2,
+    height: 100,
+    displayValue: true,
+    lineColor: '#000000',
+    background: '#ffffff',
+    fontSize: 12,
+    margin: 10,
+  },
+};

apps/isa-app/stories/ui/input-controls/dropdown-button.stories.ts

@@ -1,51 +1,106 @@
-import {
-  DropdownAppearance,
-  DropdownButtonComponent,
-  DropdownOptionComponent,
-} from '@isa/ui/input-controls';
-import { type Meta, type StoryObj, argsToTemplate, moduleMetadata } from '@storybook/angular';
-
-type DropdownInputProps = {
-  value: string;
-  label: string;
-  appearance: DropdownAppearance;
-};
-
-const meta: Meta<DropdownInputProps> = {
-  title: 'ui/input-controls/Dropdown',
-  decorators: [
-    moduleMetadata({
-      imports: [DropdownButtonComponent, DropdownOptionComponent],
-    }),
-  ],
-  argTypes: {
-    value: { control: 'text' },
-    label: { control: 'text' },
-    appearance: {
-      control: 'select',
-      options: Object.values(DropdownAppearance),
-    },
-  },
-  render: (args) => ({
-    props: args,
-    template: `
-        <ui-dropdown ${argsToTemplate(args)}>
-            <ui-dropdown-option value="">Select an option</ui-dropdown-option>
-            <ui-dropdown-option value="1">Option 1</ui-dropdown-option>
-            <ui-dropdown-option value="2">Option 2</ui-dropdown-option>
-            <ui-dropdown-option value="3">Option 3</ui-dropdown-option>
-        </ui-dropdown>
-    `,
-  }),
-};
-
-export default meta;
-
-type Story = StoryObj<DropdownInputProps>;
-
-export const Default: Story = {
-  args: {
-    value: undefined,
-    label: 'Label',
-  },
-};
+import {
+  DropdownAppearance,
+  DropdownButtonComponent,
+  DropdownFilterComponent,
+  DropdownOptionComponent,
+} from '@isa/ui/input-controls';
+import {
+  type Meta,
+  type StoryObj,
+  argsToTemplate,
+  moduleMetadata,
+} from '@storybook/angular';
+
+type DropdownInputProps = {
+  value: string;
+  label: string;
+  appearance: DropdownAppearance;
+};
+
+const meta: Meta<DropdownInputProps> = {
+  title: 'ui/input-controls/Dropdown',
+  decorators: [
+    moduleMetadata({
+      imports: [
+        DropdownButtonComponent,
+        DropdownFilterComponent,
+        DropdownOptionComponent,
+      ],
+    }),
+  ],
+  argTypes: {
+    value: { control: 'text' },
+    label: { control: 'text' },
+    appearance: {
+      control: 'select',
+      options: Object.values(DropdownAppearance),
+    },
+  },
+  render: (args) => ({
+    props: args,
+    template: `
+        <ui-dropdown ${argsToTemplate(args)}>
+            <ui-dropdown-option value="">Select an option</ui-dropdown-option>
+            <ui-dropdown-option value="1">Option 1</ui-dropdown-option>
+            <ui-dropdown-option value="2">Option 2</ui-dropdown-option>
+            <ui-dropdown-option value="3">Option 3</ui-dropdown-option>
+        </ui-dropdown>
+    `,
+  }),
+};
+
+export default meta;
+
+type Story = StoryObj<DropdownInputProps>;
+
+export const Default: Story = {
+  args: {
+    value: undefined,
+    label: 'Label',
+  },
+};
+
+export const WithFilter: Story = {
+  args: {
+    value: undefined,
+    label: 'Select a country',
+  },
+  render: (args) => ({
+    props: args,
+    template: `
+        <ui-dropdown ${argsToTemplate(args)}>
+            <ui-dropdown-filter placeholder="Search countries..."></ui-dropdown-filter>
+            <ui-dropdown-option value="">Select a country</ui-dropdown-option>
+            <ui-dropdown-option value="de">Germany</ui-dropdown-option>
+            <ui-dropdown-option value="at">Austria</ui-dropdown-option>
+            <ui-dropdown-option value="ch">Switzerland</ui-dropdown-option>
+            <ui-dropdown-option value="fr">France</ui-dropdown-option>
+            <ui-dropdown-option value="it">Italy</ui-dropdown-option>
+            <ui-dropdown-option value="es">Spain</ui-dropdown-option>
+            <ui-dropdown-option value="nl">Netherlands</ui-dropdown-option>
+            <ui-dropdown-option value="be">Belgium</ui-dropdown-option>
+            <ui-dropdown-option value="pl">Poland</ui-dropdown-option>
+            <ui-dropdown-option value="cz">Czech Republic</ui-dropdown-option>
+        </ui-dropdown>
+    `,
+  }),
+};
+
+export const GreyAppearance: Story = {
+  args: {
+    value: undefined,
+    label: 'Filter',
+    appearance: DropdownAppearance.Grey,
+  },
+};
+
+export const Disabled: Story = {
+  render: () => ({
+    template: `
+        <ui-dropdown label="Disabled dropdown" [disabled]="true">
+            <ui-dropdown-option value="1">Option 1</ui-dropdown-option>
+            <ui-dropdown-option value="2">Option 2</ui-dropdown-option>
+        </ui-dropdown>
+    `,
+  }),
+};

apps/isa-app/stories/ui/label/ui-label.stories.ts

@@ -1,33 +1,25 @@
 import { argsToTemplate, type Meta, type StoryObj } from '@storybook/angular';
-import { Labeltype, LabelPriority, LabelComponent } from '@isa/ui/label';
+import { LabelComponent } from '@isa/ui/label';
 
-type UiLabelInputs = {
-  type: Labeltype;
-  priority: LabelPriority;
+type LabelInputs = {
+  active: boolean;
 };
 
-const meta: Meta<UiLabelInputs> = {
+const meta: Meta<LabelInputs> = {
   component: LabelComponent,
   title: 'ui/label/Label',
   argTypes: {
-    type: {
-      control: { type: 'select' },
-      options: Object.values(Labeltype),
-      description: 'Determines the label type',
-    },
-    priority: {
-      control: { type: 'select' },
-      options: Object.values(LabelPriority),
-      description: 'Determines the label priority',
+    active: {
+      control: { type: 'boolean' },
+      description: 'Determines if the label is active (hover/pressed state)',
     },
   },
   args: {
-    type: 'tag',
-    priority: 'high',
+    active: false,
   },
   render: (args) => ({
     props: args,
-    template: `<ui-label ${argsToTemplate(args)}>Prio 1</ui-label>`,
+    template: `<ui-label ${argsToTemplate(args)}>Prämie</ui-label>`,
   }),
 };
 export default meta;
@@ -37,3 +29,21 @@ type Story = StoryObj<LabelComponent>;
 export const Default: Story = {
   args: {},
 };
+
+export const Active: Story = {
+  args: {
+    active: true,
+  },
+};
+
+export const RewardExample: Story = {
+  args: {},
+  render: () => ({
+    template: `
+      <div style="display: flex; gap: 1rem; align-items: center;">
+        <ui-label>Prämie</ui-label>
+        <ui-label [active]="true">Active</ui-label>
+      </div>
+    `,
+  }),
+};

apps/isa-app/stories/ui/label/ui-prio-label.stories.ts

@@ -0,0 +1,59 @@
+import { argsToTemplate, type Meta, type StoryObj } from '@storybook/angular';
+import { PrioLabelComponent } from '@isa/ui/label';
+
+type PrioLabelInputs = {
+  priority: 1 | 2;
+};
+
+const meta: Meta<PrioLabelInputs> = {
+  component: PrioLabelComponent,
+  title: 'ui/label/PrioLabel',
+  argTypes: {
+    priority: {
+      control: { type: 'select' },
+      options: [1, 2],
+      description: 'The priority level (1 = high, 2 = low)',
+    },
+  },
+  args: {
+    priority: 1,
+  },
+  render: (args) => ({
+    props: args,
+    template: `<ui-prio-label ${argsToTemplate(args)}>Pflicht</ui-prio-label>`,
+  }),
+};
+export default meta;
+
+type Story = StoryObj<PrioLabelComponent>;
+
+export const Priority1: Story = {
+  args: {
+    priority: 1,
+  },
+  render: (args) => ({
+    props: args,
+    template: `<ui-prio-label [priority]="priority">Pflicht</ui-prio-label>`,
+  }),
+};
+
+export const Priority2: Story = {
+  args: {
+    priority: 2,
+  },
+  render: (args) => ({
+    props: args,
+    template: `<ui-prio-label [priority]="priority">Prio 2</ui-prio-label>`,
+  }),
+};
+
+export const AllPriorities: Story = {
+  render: () => ({
+    template: `
+      <div style="display: flex; gap: 1rem; align-items: center;">
+        <ui-prio-label [priority]="1">Pflicht</ui-prio-label>
+        <ui-prio-label [priority]="2">Prio 2</ui-prio-label>
+      </div>
+    `,
+  }),
+};

apps/isa-app/stories/ui/notice/ui-notice.stories.ts

@@ -0,0 +1,70 @@
+import { argsToTemplate, type Meta, type StoryObj } from '@storybook/angular';
+import { NoticeComponent, NoticePriority } from '@isa/ui/notice';
+
+type NoticeInputs = {
+  priority: NoticePriority;
+};
+
+const meta: Meta<NoticeInputs> = {
+  component: NoticeComponent,
+  title: 'ui/notice/Notice',
+  argTypes: {
+    priority: {
+      control: { type: 'select' },
+      options: Object.values(NoticePriority),
+      description: 'The priority level (high, medium, low)',
+    },
+  },
+  args: {
+    priority: NoticePriority.High,
+  },
+  render: (args) => ({
+    props: args,
+    template: `<ui-notice ${argsToTemplate(args)}>Important message</ui-notice>`,
+  }),
+};
+export default meta;
+
+type Story = StoryObj<NoticeComponent>;
+
+export const High: Story = {
+  args: {
+    priority: NoticePriority.High,
+  },
+  render: (args) => ({
+    props: args,
+    template: `<ui-notice [priority]="priority">Action Required</ui-notice>`,
+  }),
+};
+
+export const Medium: Story = {
+  args: {
+    priority: NoticePriority.Medium,
+  },
+  render: (args) => ({
+    props: args,
+    template: `<ui-notice [priority]="priority">Secondary Information</ui-notice>`,
+  }),
+};
+
+export const Low: Story = {
+  args: {
+    priority: NoticePriority.Low,
+  },
+  render: (args) => ({
+    props: args,
+    template: `<ui-notice [priority]="priority">Info Message</ui-notice>`,
+  }),
+};
+
+export const AllPriorities: Story = {
+  render: () => ({
+    template: `
+      <div style="display: flex; flex-direction: column; gap: 1rem;">
+        <ui-notice priority="high">High Priority</ui-notice>
+        <ui-notice priority="medium">Medium Priority</ui-notice>
+        <ui-notice priority="low">Low Priority</ui-notice>
+      </div>
+    `,
+  }),
+};

apps/isa-app/stories/ui/switch/ui-icon-switch.stories.ts

@@ -1,5 +1,5 @@
 import { argsToTemplate, type Meta, type StoryObj } from '@storybook/angular';
-import { IconSwitchComponent, IconSwitchColor } from '@isa/ui/switch';
+import { SwitchComponent, IconSwitchColor } from '@isa/ui/switch';
 import { provideIcons } from '@ng-icons/core';
 import { isaFiliale, IsaIcons, isaNavigationDashboard } from '@isa/icons';
 
@@ -11,7 +11,7 @@ type IconSwitchComponentInputs = {
 };
 
 const meta: Meta<IconSwitchComponentInputs> = {
-  component: IconSwitchComponent,
+  component: SwitchComponent,
   title: 'ui/switch/IconSwitch',
   decorators: [
     (story) => ({
@@ -49,12 +49,12 @@ const meta: Meta<IconSwitchComponentInputs> = {
   },
   render: (args) => ({
     props: args,
-    template: `<ui-icon-switch ${argsToTemplate(args)}></ui-icon-switch>`,
+    template: `<ui-switch ${argsToTemplate(args)}></ui-switch>`,
   }),
 };
 export default meta;
 
-type Story = StoryObj<IconSwitchComponent>;
+type Story = StoryObj<SwitchComponent>;
 
 export const Default: Story = {
   args: {},

azure-pipelines.yml

@@ -12,12 +12,21 @@ variables:
     value: '4'
   # Minor Version einstellen
   - name: 'Minor'
-    value: '2'
+    value: '5'
   - name: 'Patch'
     value: "$[counter(format('{0}.{1}', variables['Major'], variables['Minor']),0)]"
   - name: 'BuildUniqueID'
     value: '$(Build.BuildID)-$(Agent.Id)-$(System.DefinitionId)-$(System.JobId)'
   - group: 'GithubCMF'
+  # Docker Tag Variablen
+  - name: 'DockerTagSourceBranch'
+    value: $[replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), '/', '_')]
+  - name: 'CommitHash'
+    value: $[replace(variables['Build.SourceVersion'], format('{0}-', variables['Build.SourceBranchName']), '')]
+  - name: 'DockerTag'
+    value: |
+          $(Build.BuildNumber)-$(Build.SourceVersion)
+          $(Major).$(Minor).$(Patch)-$(DockerTagSourceBranch)-$(CommitHash)
 
 jobs:
   - job: unittests
@@ -87,13 +96,6 @@ jobs:
         - Agent.OS -equals Linux
         - docker
     condition: and(ne(variables['Build.SourceBranch'], 'refs/heads/integration'), ne(variables['Build.SourceBranch'], 'refs/heads/master'), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/hotfix/')), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))
-    variables:
-      - name: DockerTagSourceBranch
-        value: $[replace(variables['Build.SourceBranch'], '/', '-')]
-      - name: 'DockerTag'
-        value: |
-          $(Build.BuildNumber)-$(Build.SourceVersion)
-          $(DockerTagSourceBranch)
     steps:
       - task: npmAuthenticate@0
         displayName: 'npm auth'
@@ -156,13 +158,6 @@ jobs:
         - Agent.OS -equals Linux
         - docker
     condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/integration'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'], 'refs/heads/hotfix/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))
-    variables:
-      - name: DockerTagSourceBranch
-        value: $[replace(variables['Build.SourceBranch'], '/', '_')]
-      - name: 'DockerTag'
-        value: |
-          $(Build.BuildNumber)-$(Build.SourceVersion)
-          $(DockerTagSourceBranch)
     steps:
       - task: npmAuthenticate@0
         displayName: 'npm auth'

docs/library-reference.md

@@ -1,11 +1,11 @@
 # Library Reference Guide
 
-> **Last Updated:** 2025-10-27
-> **Angular Version:** 20.1.2
+> **Last Updated:** 2025-11-28
+> **Angular Version:** 20.3.6
 > **Nx Version:** 21.3.2
-> **Total Libraries:** 62
+> **Total Libraries:** 74
 
-All 62 libraries in the monorepo have comprehensive README.md documentation located at `libs/[domain]/[layer]/[feature]/README.md`.
+All 74 libraries in the monorepo have comprehensive README.md documentation located at `libs/[domain]/[layer]/[feature]/README.md`.
 
 **IMPORTANT: Always use the `docs-researcher` subagent** to retrieve and analyze library documentation. This keeps the main context clean and prevents pollution.
 
@@ -23,13 +23,13 @@ A comprehensive product availability service for Angular applications supporting
 ## Catalogue Domain (1 library)
 
 ### `@isa/catalogue/data-access`
-A comprehensive product catalogue search and availability service for Angular applications, providing catalog item search, loyalty program integration, and specialized availability validation for download and delivery order types.
+A comprehensive product catalogue search service for Angular applications, providing catalog item search and loyalty program integration.
 
 **Location:** `libs/catalogue/data-access/`
 
 ---
 
-## Checkout Domain (6 libraries)
+## Checkout Domain (7 libraries)
 
 ### `@isa/checkout/data-access`
 A comprehensive checkout and shopping cart management library for Angular applications supporting multiple order types, reward redemption, and complex multi-step checkout workflows across retail and e-commerce operations.
@@ -37,7 +37,7 @@ A comprehensive checkout and shopping cart management library for Angular applic
 **Location:** `libs/checkout/data-access/`
 
 ### `@isa/checkout/feature/reward-order-confirmation`
-This library was generated with [Nx](https://nx.dev).
+A feature library providing a comprehensive order confirmation page for reward orders with support for printing, address display, and loyalty reward collection.
 
 **Location:** `libs/checkout/feature/reward-order-confirmation/`
 
@@ -46,6 +46,11 @@ A comprehensive reward shopping cart feature for Angular applications supporting
 
 **Location:** `libs/checkout/feature/reward-shopping-cart/`
 
+### `@isa/checkout/feature/select-branch-dropdown`
+Branch selection dropdown components for the checkout domain, enabling users to select a branch for their checkout session.
+
+**Location:** `libs/checkout/feature/select-branch-dropdown/`
+
 ### `@isa/checkout/shared/product-info`
 A comprehensive collection of presentation components for displaying product information, destination details, and stock availability in checkout and rewards workflows.
 
@@ -57,8 +62,6 @@ A comprehensive loyalty rewards catalog feature for Angular applications support
 **Location:** `libs/checkout/feature/reward-catalog/`
 
 ### `@isa/checkout/shared/reward-selection-dialog`
-Angular library for managing reward selection in shopping cart context. Allows users to toggle between regular purchase and reward redemption using bonus points.
-
 **Location:** `libs/checkout/shared/reward-selection-dialog/`
 
 ---
@@ -82,7 +85,12 @@ A comprehensive print management library for Angular applications providing prin
 
 ---
 
-## Core Libraries (5 libraries)
+## Core Libraries (6 libraries)
+
+### `@isa/core/auth`
+Type-safe role-based authorization utilities with Angular signals integration for the ISA Frontend application.
+
+**Location:** `libs/core/auth/`
 
 ### `@isa/core/config`
 A lightweight, type-safe configuration management system for Angular applications with runtime validation and nested object access.
@@ -111,19 +119,37 @@ A sophisticated tab management system for Angular applications providing browser
 
 ---
 
-## CRM Domain (1 library)
+## CRM Domain (5 libraries)
 
 ### `@isa/crm/data-access`
-A comprehensive Customer Relationship Management (CRM) data access library for Angular applications providing customer, shipping address, payer, and bonus card management with reactive data loading using Angular resources.
-
 **Location:** `libs/crm/data-access/`
 
+### `@isa/crm/feature/customer-bon-redemption`
+A feature library providing customer loyalty receipt (Bon) redemption functionality with validation and point allocation capabilities.
+
+**Location:** `libs/crm/feature/customer-bon-redemption/`
+
+### `@isa/crm/feature/customer-booking`
+A standalone Angular component that enables customer loyalty card point booking and reversal with configurable booking reasons.
+
+**Location:** `libs/crm/feature/customer-booking/`
+
+### `@isa/crm/feature/customer-card-transactions`
+A standalone Angular component that displays customer loyalty card transaction history with automatic data loading and refresh capabilities.
+
+**Location:** `libs/crm/feature/customer-card-transactions/`
+
+### `@isa/crm/feature/customer-loyalty-cards`
+Customer loyalty cards feature module for displaying and managing customer bonus cards (Kundenkarten) with points tracking and card management actions.
+
+**Location:** `libs/crm/feature/customer-loyalty-cards/`
+
 ---
 
 ## Icons (1 library)
 
 ### `@isa/icons`
-This library was generated with [Nx](https://nx.dev).
+A centralized icon library for the ISA-Frontend monorepo providing inline SVG icons as string constants.
 
 **Location:** `libs/icons/`
 
@@ -180,16 +206,16 @@ A specialized Angular component library for displaying and managing return recei
 
 ## Remission Domain (8 libraries)
 
-### `@isa/remission/feature/remission-list`
-Feature module providing the main remission list view with filtering, searching, item selection, and remitting capabilities for department ("Abteilung") and mandatory ("Pflicht") return workflows.
-
-**Location:** `libs/remission/feature/remission-list/`
-
 ### `@isa/remission/data-access`
 A comprehensive remission (returns) management system for Angular applications supporting mandatory returns (Pflichtremission) and department overflow returns (Abteilungsremission) in retail inventory operations.
 
 **Location:** `libs/remission/data-access/`
 
+### `@isa/remission/feature/remission-list`
+Feature module providing the main remission list view with filtering, searching, item selection, and remitting capabilities for department ("Abteilung") and mandatory ("Pflicht") return workflows.
+
+**Location:** `libs/remission/feature/remission-list/`
+
 ### `@isa/remission/feature/remission-return-receipt-details`
 Feature component for displaying detailed view of a return receipt ("Warenbegleitschein") with items, actions, and completion workflows.
 
@@ -200,35 +226,45 @@ Feature component providing a comprehensive list view of all return receipts wit
 
 **Location:** `libs/remission/feature/remission-return-receipt-list/`
 
-### `@isa/remission/shared/return-receipt-actions`
-Angular standalone components for managing return receipt actions including deletion, continuation, and completion workflows in the remission process.
-
-**Location:** `libs/remission/shared/return-receipt-actions/`
-
 ### `@isa/remission/shared/product`
 A collection of Angular standalone components for displaying product information in remission workflows, including product details, stock information, and shelf metadata.
 
 **Location:** `libs/remission/shared/product/`
 
-### `@isa/remission/shared/search-item-to-remit-dialog`
-Angular dialog component for searching and adding items to remission lists that are not on the mandatory return list (Pflichtremission).
-
-**Location:** `libs/remission/shared/search-item-to-remit-dialog/`
-
 ### `@isa/remission/shared/remission-start-dialog`
 Angular dialog component for initiating remission processes with two-step workflow: creating return receipts and assigning package numbers.
 
 **Location:** `libs/remission/shared/remission-start-dialog/`
 
+### `@isa/remission/shared/return-receipt-actions`
+Angular standalone components for managing return receipt actions including deletion, continuation, and completion workflows in the remission process.
+
+**Location:** `libs/remission/shared/return-receipt-actions/`
+
+### `@isa/remission/shared/search-item-to-remit-dialog`
+Angular dialog component for searching and adding items to remission lists that are not on the mandatory return list (Pflichtremission).
+
+**Location:** `libs/remission/shared/search-item-to-remit-dialog/`
+
 ---
 
-## Shared Component Libraries (7 libraries)
+## Shared Component Libraries (9 libraries)
 
 ### `@isa/shared/address`
 Comprehensive Angular components for displaying addresses in both multi-line and inline formats with automatic country name resolution and intelligent formatting.
 
 **Location:** `libs/shared/address/`
 
+### `@isa/shared/barcode`
+Angular library for generating Code 128 barcodes using [JsBarcode](https://github.com/lindell/JsBarcode).
+
+**Location:** `libs/shared/barcode/`
+
+### `@isa/shared/delivery`
+A reusable Angular component library for displaying order destination information with support for multiple delivery types (shipping, pickup, in-store, and digital downloads).
+
+**Location:** `libs/shared/delivery/`
+
 ### `@isa/shared/filter`
 A powerful and flexible filtering library for Angular applications that provides a complete solution for implementing filters, search functionality, and sorting capabilities.
 
@@ -255,18 +291,13 @@ An accessible, feature-rich Angular quantity selector component with dropdown pr
 **Location:** `libs/shared/quantity-control/`
 
 ### `@isa/shared/scanner`
-## Overview
+Enterprise-grade barcode scanning library for ISA-Frontend using the Scandit SDK, providing mobile barcode scanning capabilities for iOS and Android platforms.
 
 **Location:** `libs/shared/scanner/`
 
 ---
 
-## UI Component Libraries (16 libraries)
-
-### `@isa/ui/label`
-A flexible label component for displaying tags and notices with configurable priority levels across Angular applications.
-
-**Location:** `libs/ui/label/`
+## UI Component Libraries (19 libraries)
 
 ### `@isa/ui/bullet-list`
 A lightweight bullet list component system for Angular applications supporting customizable icons and hierarchical content presentation.
@@ -279,7 +310,7 @@ A comprehensive button component library for Angular applications providing five
 **Location:** `libs/ui/buttons/`
 
 ### `@isa/ui/carousel`
-A horizontal scroll container component with left/right navigation arrows, responsive behavior, keyboard support, and auto-hide functionality for Angular applications.
+A horizontal scroll container component with left/right navigation arrows, responsive behavior, keyboard support, and auto-hide functionality.
 
 **Location:** `libs/ui/carousel/`
 
@@ -313,8 +344,13 @@ A collection of reusable row components for displaying structured data with cons
 
 **Location:** `libs/ui/item-rows/`
 
+### `@isa/ui/label`
+Label components for displaying tags, categories, and priority indicators.
+
+**Location:** `libs/ui/label/`
+
 ### `@isa/ui/layout`
-This library provides utilities and directives for responsive design in Angular applications.
+This library provides utilities and directives for responsive design and viewport behavior in Angular applications.
 
 **Location:** `libs/ui/layout/`
 
@@ -323,6 +359,11 @@ A lightweight Angular component library providing accessible menu components bui
 
 **Location:** `libs/ui/menu/`
 
+### `@isa/ui/notice`
+A notice component for displaying prominent notifications and alerts with configurable priority levels.
+
+**Location:** `libs/ui/notice/`
+
 ### `@isa/ui/progress-bar`
 A lightweight Angular progress bar component supporting both determinate and indeterminate modes.
 
@@ -338,6 +379,11 @@ A lightweight Angular structural directive and component for displaying skeleton
 
 **Location:** `libs/ui/skeleton-loader/`
 
+### `@isa/ui/switch`
+This library provides a toggle switch component with an icon for Angular applications.
+
+**Location:** `libs/ui/switch/`
+
 ### `@isa/ui/toolbar`
 A flexible toolbar container component for Angular applications with configurable sizing and content projection.
 
@@ -350,15 +396,25 @@ A flexible tooltip library for Angular applications, built with Angular CDK over
 
 ---
 
-## Utility Libraries (3 libraries)
+## Utility Libraries (5 libraries)
 
 ### `@isa/utils/ean-validation`
 Lightweight Angular utility library for validating EAN (European Article Number) barcodes with reactive forms integration and standalone validation functions.
 
 **Location:** `libs/utils/ean-validation/`
 
+### `@isa/utils/format-name`
+A utility library for consistently formatting person and organisation names across the ISA-Frontend application.
+
+**Location:** `libs/utils/format-name/`
+
+### `@isa/utils/positive-integer-input`
+An Angular directive that ensures only positive integers can be entered into number input fields through keyboard blocking, paste sanitization, and input validation.
+
+**Location:** `libs/utils/positive-integer-input/`
+
 ### `@isa/utils/scroll-position`
-## Overview
+Utility library providing scroll position restoration and scroll-to-top functionality for Angular applications.
 
 **Location:** `libs/utils/scroll-position/`
 

eslint.config.js

@@ -10,26 +10,277 @@ module.exports = [
       '**/dist',
       '**/vite.config.*.timestamp*',
       '**/vitest.config.*.timestamp*',
+      '**/generated/**',
     ],
   },
-  // {
-  //   files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
-  //   rules: {
-  //     '@nx/enforce-module-boundaries': [
-  //       'error',
-  //       {
-  //         enforceBuildableLibDependency: true,
-  //         allow: ['^.*/eslint(\\.base)?\\.config\\.[cm]?js$'],
-  //         depConstraints: [
-  //           {
-  //             sourceTag: '*',
-  //             onlyDependOnLibsWithTags: ['*'],
-  //           },
-  //         ],
-  //       },
-  //     ],
-  //   },
-  // },
+  {
+    files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
+    rules: {
+      '@nx/enforce-module-boundaries': [
+        'error',
+        {
+          enforceBuildableLibDependency: true,
+          allow: ['^.*/eslint(\\.base)?\\.config\\.[cm]?js$'],
+          depConstraints: [
+            // ========================================
+            // TYPE-BASED CONSTRAINTS (Layer Rules)
+            // ========================================
+
+            // FEATURE libraries can import: data-access, ui, shared, util, core (within same domain)
+            {
+              sourceTag: 'type:feature',
+              onlyDependOnLibsWithTags: [
+                'type:data-access',
+                'type:ui',
+                'type:shared',
+                'type:util',
+                'type:core',
+                'type:common',
+                'type:icon',
+              ],
+            },
+
+            // DATA-ACCESS libraries can import: util, generated, common-data-access only
+            {
+              sourceTag: 'type:data-access',
+              onlyDependOnLibsWithTags: [
+                'type:util',
+                'type:generated',
+                'type:common',
+                'type:core',
+              ],
+              bannedExternalImports: [],
+            },
+
+            // DATA-ACCESS cannot import other DATA-ACCESS (except common)
+            {
+              sourceTag: 'type:data-access',
+              notDependOnLibsWithTags: ['type:data-access'],
+              allowedExternalImports: [],
+            },
+
+            // UI libraries can import: util, core only (NOT shared, NOT data-access)
+            {
+              sourceTag: 'type:ui',
+              onlyDependOnLibsWithTags: ['type:util', 'type:core', 'type:icon'],
+            },
+
+            // SHARED libraries can import: ui, util, core within same domain
+            {
+              sourceTag: 'type:shared',
+              onlyDependOnLibsWithTags: [
+                'type:ui',
+                'type:util',
+                'type:core',
+                'type:common',
+                'type:icon',
+              ],
+            },
+
+            // UTIL libraries are leaf nodes - cannot import feature/data-access/ui/shared
+            {
+              sourceTag: 'type:util',
+              onlyDependOnLibsWithTags: ['type:util', 'type:core'],
+            },
+
+            // GENERATED (swagger clients) can only be imported by data-access
+            // This is enforced by the data-access rule above
+
+            // CORE libraries can be imported by anyone, but cannot import feature/data-access
+            {
+              sourceTag: 'type:core',
+              onlyDependOnLibsWithTags: ['type:core', 'type:util', 'type:common'],
+            },
+
+            // COMMON libraries can be imported by anyone
+            {
+              sourceTag: 'type:common',
+              onlyDependOnLibsWithTags: [
+                'type:util',
+                'type:core',
+                'type:generated',
+              ],
+            },
+
+            // ICON libraries can be imported by anyone
+            {
+              sourceTag: 'type:icon',
+              onlyDependOnLibsWithTags: [],
+            },
+
+            // ========================================
+            // DOMAIN-BASED CONSTRAINTS (Scope Rules)
+            // ========================================
+
+            // OMS domain can only import from OMS, shared, core, common, ui, utils, icons
+            {
+              sourceTag: 'scope:oms',
+              onlyDependOnLibsWithTags: [
+                'scope:oms',
+                'scope:shared',
+                'scope:core',
+                'scope:common',
+                'scope:ui',
+                'scope:utils',
+                'scope:icons',
+                'scope:generated',
+              ],
+            },
+
+            // CRM domain can only import from CRM, shared, core, common, ui, utils, icons
+            {
+              sourceTag: 'scope:crm',
+              onlyDependOnLibsWithTags: [
+                'scope:crm',
+                'scope:shared',
+                'scope:core',
+                'scope:common',
+                'scope:ui',
+                'scope:utils',
+                'scope:icons',
+                'scope:generated',
+              ],
+            },
+
+            // REMISSION domain can only import from REMISSION, shared, core, common, ui, utils, icons
+            {
+              sourceTag: 'scope:remission',
+              onlyDependOnLibsWithTags: [
+                'scope:remission',
+                'scope:shared',
+                'scope:core',
+                'scope:common',
+                'scope:ui',
+                'scope:utils',
+                'scope:icons',
+                'scope:generated',
+              ],
+            },
+
+            // CHECKOUT domain can only import from CHECKOUT, shared, core, common, ui, utils, icons
+            {
+              sourceTag: 'scope:checkout',
+              onlyDependOnLibsWithTags: [
+                'scope:checkout',
+                'scope:shared',
+                'scope:core',
+                'scope:common',
+                'scope:ui',
+                'scope:utils',
+                'scope:icons',
+                'scope:generated',
+              ],
+            },
+
+            // AVAILABILITY domain can only import from AVAILABILITY, shared, core, common, ui, utils, icons
+            {
+              sourceTag: 'scope:availability',
+              onlyDependOnLibsWithTags: [
+                'scope:availability',
+                'scope:shared',
+                'scope:core',
+                'scope:common',
+                'scope:ui',
+                'scope:utils',
+                'scope:icons',
+                'scope:generated',
+              ],
+            },
+
+            // CATALOGUE domain can only import from CATALOGUE, shared, core, common, ui, utils, icons
+            {
+              sourceTag: 'scope:catalogue',
+              onlyDependOnLibsWithTags: [
+                'scope:catalogue',
+                'scope:shared',
+                'scope:core',
+                'scope:common',
+                'scope:ui',
+                'scope:utils',
+                'scope:icons',
+                'scope:generated',
+              ],
+            },
+
+            // SHARED libraries can be imported by all domains
+            {
+              sourceTag: 'scope:shared',
+              onlyDependOnLibsWithTags: [
+                'scope:shared',
+                'scope:core',
+                'scope:common',
+                'scope:ui',
+                'scope:utils',
+                'scope:icons',
+              ],
+            },
+
+            // UI libraries can be imported by all domains
+            {
+              sourceTag: 'scope:ui',
+              onlyDependOnLibsWithTags: [
+                'scope:ui',
+                'scope:core',
+                'scope:utils',
+                'scope:icons',
+              ],
+            },
+
+            // UTILS libraries can be imported by all domains
+            {
+              sourceTag: 'scope:utils',
+              onlyDependOnLibsWithTags: ['scope:utils', 'scope:core'],
+            },
+
+            // CORE libraries can be imported by all domains
+            {
+              sourceTag: 'scope:core',
+              onlyDependOnLibsWithTags: ['scope:core', 'scope:common', 'scope:utils'],
+            },
+
+            // COMMON libraries can be imported by all domains
+            {
+              sourceTag: 'scope:common',
+              onlyDependOnLibsWithTags: [
+                'scope:common',
+                'scope:core',
+                'scope:utils',
+                'scope:generated',
+              ],
+            },
+
+            // ICONS libraries can be imported by all domains
+            {
+              sourceTag: 'scope:icons',
+              onlyDependOnLibsWithTags: [],
+            },
+
+            // GENERATED (swagger) can only be imported by data-access
+            {
+              sourceTag: 'scope:generated',
+              onlyDependOnLibsWithTags: [],
+            },
+
+            // ========================================
+            // SPECIAL RULES
+            // ========================================
+
+            // APP scope - violations ignored for now (as per user requirement)
+            {
+              sourceTag: 'scope:app',
+              onlyDependOnLibsWithTags: ['*'],
+            },
+
+            // Disallow relative imports - must use path aliases
+            {
+              sourceTag: '*',
+              bannedExternalImports: ['../*', '../../*', '../../../*'],
+            },
+          ],
+        },
+      ],
+    },
+  },
   {
     files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
   },

generated/swagger/availability-api/project.json

@@ -4,7 +4,14 @@
   "sourceRoot": "generated/swagger/availability-api/src",
   "prefix": "lib",
   "projectType": "library",
-  "tags": ["generated","swagger","availability","api"],
+  "tags": [
+    "generated",
+    "swagger",
+    "availability",
+    "api",
+    "scope:generated",
+    "type:generated"
+  ],
   "targets": {
     "generate": {
       "command": "ng-swagger-gen --config {projectRoot}/ng-swagger-gen.json --output {projectRoot}/src",
@@ -13,7 +20,9 @@
         "{projectRoot}/ng-swagger-gen.json",
         "!{projectRoot}/src/**/*.ts"
       ],
-      "outputs": ["{projectRoot}/src"],
+      "outputs": [
+        "{projectRoot}/src"
+      ],
       "cache": false
     }
   }

generated/swagger/cat-search-api/project.json

@@ -4,7 +4,14 @@
   "sourceRoot": "generated/swagger/cat-search-api/src",
   "prefix": "lib",
   "projectType": "library",
-  "tags": ["generated","swagger", "cat-search", "api"],
+  "tags": [
+    "generated",
+    "swagger",
+    "cat-search",
+    "api",
+    "scope:generated",
+    "type:generated"
+  ],
   "targets": {
     "generate": {
       "command": "ng-swagger-gen --config {projectRoot}/ng-swagger-gen.json --output {projectRoot}/src",
@@ -13,7 +20,9 @@
         "{projectRoot}/ng-swagger-gen.json",
         "!{projectRoot}/src/**/*.ts"
       ],
-      "outputs": ["{projectRoot}/src"],
+      "outputs": [
+        "{projectRoot}/src"
+      ],
       "cache": false
     }
   }

generated/swagger/checkout-api/project.json

@@ -4,7 +4,14 @@
   "sourceRoot": "generated/swagger/checkout-api/src",
   "prefix": "lib",
   "projectType": "library",
-  "tags": ["generated","swagger", "checkout", "api"],
+  "tags": [
+    "generated",
+    "swagger",
+    "checkout",
+    "api",
+    "scope:generated",
+    "type:generated"
+  ],
   "targets": {
     "generate": {
       "command": "ng-swagger-gen --config {projectRoot}/ng-swagger-gen.json --output {projectRoot}/src",
@@ -13,7 +20,9 @@
         "{projectRoot}/ng-swagger-gen.json",
         "!{projectRoot}/src/**/*.ts"
       ],
-      "outputs": ["{projectRoot}/src"],
+      "outputs": [
+        "{projectRoot}/src"
+      ],
       "cache": false
     }
   }

generated/swagger/crm-api/project.json

@@ -4,7 +4,14 @@
   "sourceRoot": "generated/swagger/crm-api/src",
   "prefix": "lib",
   "projectType": "library",
-  "tags": ["generated","swagger", "crm", "api"],
+  "tags": [
+    "generated",
+    "swagger",
+    "crm",
+    "api",
+    "scope:generated",
+    "type:generated"
+  ],
   "targets": {
     "generate": {
       "command": "ng-swagger-gen --config {projectRoot}/ng-swagger-gen.json --output {projectRoot}/src",
@@ -13,7 +20,9 @@
         "{projectRoot}/ng-swagger-gen.json",
         "!{projectRoot}/src/**/*.ts"
       ],
-      "outputs": ["{projectRoot}/src"],
+      "outputs": [
+        "{projectRoot}/src"
+      ],
       "cache": false
     }
   }

generated/swagger/crm-api/src/models.ts

@@ -76,6 +76,15 @@ export { EntityDTOBaseOfCustomerInfoDTOAndICustomer } from './models/entity-dtob
 export { QueryTokenDTO } from './models/query-token-dto';
 export { QueryTokenDTO2 } from './models/query-token-dto2';
 export { ResponseArgsOfCustomerDTO } from './models/response-args-of-customer-dto';
+export { ResponseArgsOfAccountDetailsDTO } from './models/response-args-of-account-details-dto';
+export { AccountDetailsDTO } from './models/account-details-dto';
+export { AccountBalanceDTO } from './models/account-balance-dto';
+export { IdentifierDTO } from './models/identifier-dto';
+export { StateLevelDTO } from './models/state-level-dto';
+export { MembershipDetailsDTO } from './models/membership-details-dto';
+export { CustomPropertyDTO } from './models/custom-property-dto';
+export { OptinDTO } from './models/optin-dto';
+export { AddLoyaltyCardValues } from './models/add-loyalty-card-values';
 export { SaveCustomerValues } from './models/save-customer-values';
 export { ResponseArgsOfAssignedPayerDTO } from './models/response-args-of-assigned-payer-dto';
 export { ResponseArgsOfBoolean } from './models/response-args-of-boolean';
@@ -92,10 +101,14 @@ export { DiffDTO } from './models/diff-dto';
 export { ResponseArgsOfIQueryResultOfLoyaltyBookingInfoDTO } from './models/response-args-of-iquery-result-of-loyalty-booking-info-dto';
 export { IQueryResultOfLoyaltyBookingInfoDTO } from './models/iquery-result-of-loyalty-booking-info-dto';
 export { LoyaltyBookingInfoDTO } from './models/loyalty-booking-info-dto';
-export { ResponseArgsOfIEnumerableOfString } from './models/response-args-of-ienumerable-of-string';
+export { ResponseArgsOfIEnumerableOfKeyValueDTOOfStringAndInteger } from './models/response-args-of-ienumerable-of-key-value-dtoof-string-and-integer';
+export { KeyValueDTOOfStringAndInteger } from './models/key-value-dtoof-string-and-integer';
 export { ResponseArgsOfKeyValueDTOOfStringAndString } from './models/response-args-of-key-value-dtoof-string-and-string';
 export { ResponseArgsOfLoyaltyBookingInfoDTO } from './models/response-args-of-loyalty-booking-info-dto';
 export { LoyaltyBookingValues } from './models/loyalty-booking-values';
+export { ResponseArgsOfLoyaltyBonResponse } from './models/response-args-of-loyalty-bon-response';
+export { LoyaltyBonResponse } from './models/loyalty-bon-response';
+export { LoyaltyBonItemResponse } from './models/loyalty-bon-item-response';
 export { LoyaltyBonValues } from './models/loyalty-bon-values';
 export { ResponseArgsOfPayerDTO } from './models/response-args-of-payer-dto';
 export { ResponseArgsOfShippingAddressDTO } from './models/response-args-of-shipping-address-dto';

generated/swagger/crm-api/src/models/account-balance-dto.ts

@@ -0,0 +1,5 @@
+/* tslint:disable */
+export interface AccountBalanceDTO {
+  lockedPoints: number;
+  points: number;
+}

generated/swagger/crm-api/src/models/account-details-dto.ts

@@ -0,0 +1,14 @@
+/* tslint:disable */
+import { AccountBalanceDTO } from './account-balance-dto';
+import { IdentifierDTO } from './identifier-dto';
+import { StateLevelDTO } from './state-level-dto';
+import { MembershipDetailsDTO } from './membership-details-dto';
+export interface AccountDetailsDTO {
+  accountBalance?: AccountBalanceDTO;
+  accountId?: string;
+  createdAt?: string;
+  identifiers?: Array<IdentifierDTO>;
+  level?: StateLevelDTO;
+  memberships?: Array<MembershipDetailsDTO>;
+  status?: string;
+}

generated/swagger/crm-api/src/models/add-loyalty-card-values.ts

@@ -0,0 +1,8 @@
+/* tslint:disable */
+export interface AddLoyaltyCardValues {
+
+  /**
+   * Card code
+   */
+  cardCode?: string;
+}

generated/swagger/crm-api/src/models/custom-property-dto.ts

@@ -0,0 +1,5 @@
+/* tslint:disable */
+export interface CustomPropertyDTO {
+  name?: string;
+  value?: string;
+}

generated/swagger/crm-api/src/models/identifier-dto.ts

@@ -0,0 +1,8 @@
+/* tslint:disable */
+export interface IdentifierDTO {
+  code?: string;
+  displayCode?: string;
+  identifierId?: string;
+  status?: string;
+  type?: string;
+}

generated/swagger/crm-api/src/models/key-value-dtoof-string-and-integer.ts

@@ -0,0 +1,12 @@
+/* tslint:disable */
+export interface KeyValueDTOOfStringAndInteger {
+  command?: string;
+  description?: string;
+  enabled?: boolean;
+  group?: string;
+  key?: string;
+  label?: string;
+  selected?: boolean;
+  sort?: number;
+  value: number;
+}

generated/swagger/crm-api/src/models/loyalty-bon-item-response.ts

@@ -0,0 +1,28 @@
+/* tslint:disable */
+export interface LoyaltyBonItemResponse {
+
+  /**
+   * EAB
+   */
+  ean?: string;
+
+  /**
+   * Artikel
+   */
+  name?: string;
+
+  /**
+   * Warengruppe
+   */
+  productGroup?: string;
+
+  /**
+   * Menge
+   */
+  quantity: number;
+
+  /**
+   * Summe VK
+   */
+  sum: number;
+}

generated/swagger/crm-api/src/models/loyalty-bon-response.ts

@@ -0,0 +1,19 @@
+/* tslint:disable */
+import { LoyaltyBonItemResponse } from './loyalty-bon-item-response';
+export interface LoyaltyBonResponse {
+
+  /**
+   * Bon Datum
+   */
+  date?: string;
+
+  /**
+   * Positionen
+   */
+  items?: Array<LoyaltyBonItemResponse>;
+
+  /**
+   * Summe
+   */
+  total?: number;
+}

generated/swagger/crm-api/src/models/membership-details-dto.ts

@@ -0,0 +1,19 @@
+/* tslint:disable */
+import { CustomPropertyDTO } from './custom-property-dto';
+import { OptinDTO } from './optin-dto';
+export interface MembershipDetailsDTO {
+  birthDate?: string;
+  city?: string;
+  countryCode?: string;
+  customProperties?: Array<CustomPropertyDTO>;
+  emailAddress?: string;
+  familyName?: string;
+  genderCode?: string;
+  givenName?: string;
+  memberRole?: string;
+  membershipId?: string;
+  optins?: Array<OptinDTO>;
+  streetHouseNo?: string;
+  userId?: string;
+  zipCode?: string;
+}

generated/swagger/crm-api/src/models/optin-dto.ts

@@ -0,0 +1,5 @@
+/* tslint:disable */
+export interface OptinDTO {
+  flag: boolean;
+  type?: string;
+}

generated/swagger/crm-api/src/models/response-args-of-account-details-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { ResponseArgs } from './response-args';
+import { AccountDetailsDTO } from './account-details-dto';
+export interface ResponseArgsOfAccountDetailsDTO extends ResponseArgs{
+  result?: AccountDetailsDTO;
+}

generated/swagger/crm-api/src/models/response-args-of-ienumerable-of-key-value-dtoof-string-and-integer.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { ResponseArgs } from './response-args';
+import { KeyValueDTOOfStringAndInteger } from './key-value-dtoof-string-and-integer';
+export interface ResponseArgsOfIEnumerableOfKeyValueDTOOfStringAndInteger extends ResponseArgs{
+  result?: Array<KeyValueDTOOfStringAndInteger>;
+}

generated/swagger/crm-api/src/models/response-args-of-ienumerable-of-string.ts

@@ -1,5 +0,0 @@
-/* tslint:disable */
-import { ResponseArgs } from './response-args';
-export interface ResponseArgsOfIEnumerableOfString extends ResponseArgs{
-  result?: Array<string>;
-}

generated/swagger/crm-api/src/models/response-args-of-loyalty-bon-response.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { ResponseArgs } from './response-args';
+import { LoyaltyBonResponse } from './loyalty-bon-response';
+export interface ResponseArgsOfLoyaltyBonResponse extends ResponseArgs{
+  result?: LoyaltyBonResponse;
+}

generated/swagger/crm-api/src/models/state-level-dto.ts

@@ -0,0 +1,10 @@
+/* tslint:disable */
+export interface StateLevelDTO {
+  currentStatePoints?: number;
+  name?: string;
+  neededStatePoints?: number;
+  neededStatePointsNextLevel?: number;
+  requiredPointsToMaintainLevel?: number;
+  requiredPointsToReachNextLevel?: number;
+  validTo?: string;
+}

generated/swagger/crm-api/src/services/customer.service.ts

@@ -17,6 +17,8 @@ import { ResponseArgsOfCustomerDTO } from '../models/response-args-of-customer-d
 import { SaveCustomerValues } from '../models/save-customer-values';
 import { CustomerDTO } from '../models/customer-dto';
 import { ResponseArgsOfBoolean } from '../models/response-args-of-boolean';
+import { ResponseArgsOfAccountDetailsDTO } from '../models/response-args-of-account-details-dto';
+import { AddLoyaltyCardValues } from '../models/add-loyalty-card-values';
 import { ResponseArgsOfAssignedPayerDTO } from '../models/response-args-of-assigned-payer-dto';
 import { ResponseArgsOfIEnumerableOfCustomerInfoDTO } from '../models/response-args-of-ienumerable-of-customer-info-dto';
 import { ResponseArgsOfIEnumerableOfBonusCardInfoDTO } from '../models/response-args-of-ienumerable-of-bonus-card-info-dto';
@@ -35,6 +37,8 @@ class CustomerService extends __BaseService {
   static readonly CustomerUpdateCustomerPath = '/customer/{customerId}';
   static readonly CustomerPatchCustomerPath = '/customer/{customerId}';
   static readonly CustomerDeleteCustomerPath = '/customer/{customerId}';
+  static readonly CustomerMergeLoyaltyAccountsPath = '/customer/{customerId}/loyalty/merge';
+  static readonly CustomerAddLoyaltyCardPath = '/customer/{customerId}/loyalty/add-card';
   static readonly CustomerCreateCustomerPath = '/customer';
   static readonly CustomerAddPayerReferencePath = '/customer/{customerId}/payer';
   static readonly CustomerDeactivateCustomerPath = '/customer/{customerId}/deactivate';
@@ -389,6 +393,106 @@ class CustomerService extends __BaseService {
     );
   }
 
+  /**
+   * Kundenkarte hinzufügen
+   * @param params The `CustomerService.CustomerMergeLoyaltyAccountsParams` containing the following parameters:
+   *
+   * - `loyaltyCardValues`:
+   *
+   * - `customerId`:
+   *
+   * - `locale`:
+   */
+  CustomerMergeLoyaltyAccountsResponse(params: CustomerService.CustomerMergeLoyaltyAccountsParams): __Observable<__StrictHttpResponse<ResponseArgsOfAccountDetailsDTO>> {
+    let __params = this.newParams();
+    let __headers = new HttpHeaders();
+    let __body: any = null;
+    __body = params.loyaltyCardValues;
+
+    if (params.locale != null) __params = __params.set('locale', params.locale.toString());
+    let req = new HttpRequest<any>(
+      'POST',
+      this.rootUrl + `/customer/${encodeURIComponent(String(params.customerId))}/loyalty/merge`,
+      __body,
+      {
+        headers: __headers,
+        params: __params,
+        responseType: 'json'
+      });
+
+    return this.http.request<any>(req).pipe(
+      __filter(_r => _r instanceof HttpResponse),
+      __map((_r) => {
+        return _r as __StrictHttpResponse<ResponseArgsOfAccountDetailsDTO>;
+      })
+    );
+  }
+  /**
+   * Kundenkarte hinzufügen
+   * @param params The `CustomerService.CustomerMergeLoyaltyAccountsParams` containing the following parameters:
+   *
+   * - `loyaltyCardValues`:
+   *
+   * - `customerId`:
+   *
+   * - `locale`:
+   */
+  CustomerMergeLoyaltyAccounts(params: CustomerService.CustomerMergeLoyaltyAccountsParams): __Observable<ResponseArgsOfAccountDetailsDTO> {
+    return this.CustomerMergeLoyaltyAccountsResponse(params).pipe(
+      __map(_r => _r.body as ResponseArgsOfAccountDetailsDTO)
+    );
+  }
+
+  /**
+   * Kundenkarte hinzufügen
+   * @param params The `CustomerService.CustomerAddLoyaltyCardParams` containing the following parameters:
+   *
+   * - `loyaltyCardValues`:
+   *
+   * - `customerId`:
+   *
+   * - `locale`:
+   */
+  CustomerAddLoyaltyCardResponse(params: CustomerService.CustomerAddLoyaltyCardParams): __Observable<__StrictHttpResponse<ResponseArgsOfAccountDetailsDTO>> {
+    let __params = this.newParams();
+    let __headers = new HttpHeaders();
+    let __body: any = null;
+    __body = params.loyaltyCardValues;
+
+    if (params.locale != null) __params = __params.set('locale', params.locale.toString());
+    let req = new HttpRequest<any>(
+      'POST',
+      this.rootUrl + `/customer/${encodeURIComponent(String(params.customerId))}/loyalty/add-card`,
+      __body,
+      {
+        headers: __headers,
+        params: __params,
+        responseType: 'json'
+      });
+
+    return this.http.request<any>(req).pipe(
+      __filter(_r => _r instanceof HttpResponse),
+      __map((_r) => {
+        return _r as __StrictHttpResponse<ResponseArgsOfAccountDetailsDTO>;
+      })
+    );
+  }
+  /**
+   * Kundenkarte hinzufügen
+   * @param params The `CustomerService.CustomerAddLoyaltyCardParams` containing the following parameters:
+   *
+   * - `loyaltyCardValues`:
+   *
+   * - `customerId`:
+   *
+   * - `locale`:
+   */
+  CustomerAddLoyaltyCard(params: CustomerService.CustomerAddLoyaltyCardParams): __Observable<ResponseArgsOfAccountDetailsDTO> {
+    return this.CustomerAddLoyaltyCardResponse(params).pipe(
+      __map(_r => _r.body as ResponseArgsOfAccountDetailsDTO)
+    );
+  }
+
   /**
    * Anlage eines neuen Kunden
    * @param payload Kundendaten
@@ -861,6 +965,24 @@ module CustomerService {
     deletionComment?: null | string;
   }
 
+  /**
+   * Parameters for CustomerMergeLoyaltyAccounts
+   */
+  export interface CustomerMergeLoyaltyAccountsParams {
+    loyaltyCardValues: AddLoyaltyCardValues;
+    customerId: number;
+    locale?: null | string;
+  }
+
+  /**
+   * Parameters for CustomerAddLoyaltyCard
+   */
+  export interface CustomerAddLoyaltyCardParams {
+    loyaltyCardValues: AddLoyaltyCardValues;
+    customerId: number;
+    locale?: null | string;
+  }
+
   /**
    * Parameters for CustomerAddPayerReference
    */

generated/swagger/crm-api/src/services/loyalty-card.service.ts

@@ -10,10 +10,11 @@ import { map as __map, filter as __filter } from 'rxjs/operators';
 import { ResponseArgsOfIQueryResultOfLoyaltyBookingInfoDTO } from '../models/response-args-of-iquery-result-of-loyalty-booking-info-dto';
 import { ResponseArgsOfLoyaltyBookingInfoDTO } from '../models/response-args-of-loyalty-booking-info-dto';
 import { LoyaltyBookingValues } from '../models/loyalty-booking-values';
-import { ResponseArgsOfIEnumerableOfString } from '../models/response-args-of-ienumerable-of-string';
+import { ResponseArgsOfIEnumerableOfKeyValueDTOOfStringAndInteger } from '../models/response-args-of-ienumerable-of-key-value-dtoof-string-and-integer';
 import { ResponseArgsOfKeyValueDTOOfStringAndString } from '../models/response-args-of-key-value-dtoof-string-and-string';
-import { ResponseArgsOfBoolean } from '../models/response-args-of-boolean';
+import { ResponseArgsOfLoyaltyBonResponse } from '../models/response-args-of-loyalty-bon-response';
 import { LoyaltyBonValues } from '../models/loyalty-bon-values';
+import { ResponseArgsOfBoolean } from '../models/response-args-of-boolean';
 import { ResponseArgsOfNullableBoolean } from '../models/response-args-of-nullable-boolean';
 @Injectable({
   providedIn: 'root',
@@ -21,12 +22,13 @@ import { ResponseArgsOfNullableBoolean } from '../models/response-args-of-nullab
 class LoyaltyCardService extends __BaseService {
   static readonly LoyaltyCardListBookingsPath = '/loyalty/{cardCode}/booking';
   static readonly LoyaltyCardAddBookingPath = '/loyalty/{cardCode}/booking';
+  static readonly LoyaltyCardListCustomerBookingsPath = '/customer/{customerId}/loyalty/booking';
   static readonly LoyaltyCardBookingReasonPath = '/loyalty/booking/reason';
   static readonly LoyaltyCardCurrentBookingPartnerStorePath = '/loyalty/booking/partner/store/current';
   static readonly LoyaltyCardLoyaltyBonCheckPath = '/loyalty/{cardCode}/bon/check';
   static readonly LoyaltyCardLoyaltyBonAddPath = '/loyalty/{cardCode}/bon/add';
   static readonly LoyaltyCardLockCardPath = '/loyalty/{cardCode}/lock';
-  static readonly LoyaltyCardUnlockCardPath = '/loyalty/{cardCode}/unlock';
+  static readonly LoyaltyCardUnlockCardPath = '/customer/{customerId}/loyalty/{cardCode}/unlock';
 
   constructor(
     config: __Configuration,
@@ -130,10 +132,55 @@ class LoyaltyCardService extends __BaseService {
     );
   }
 
+  /**
+   * Bookings / Buchungen
+   * @param params The `LoyaltyCardService.LoyaltyCardListCustomerBookingsParams` containing the following parameters:
+   *
+   * - `customerId`:
+   *
+   * - `locale`:
+   */
+  LoyaltyCardListCustomerBookingsResponse(params: LoyaltyCardService.LoyaltyCardListCustomerBookingsParams): __Observable<__StrictHttpResponse<ResponseArgsOfIQueryResultOfLoyaltyBookingInfoDTO>> {
+    let __params = this.newParams();
+    let __headers = new HttpHeaders();
+    let __body: any = null;
+
+    if (params.locale != null) __params = __params.set('locale', params.locale.toString());
+    let req = new HttpRequest<any>(
+      'GET',
+      this.rootUrl + `/customer/${encodeURIComponent(String(params.customerId))}/loyalty/booking`,
+      __body,
+      {
+        headers: __headers,
+        params: __params,
+        responseType: 'json'
+      });
+
+    return this.http.request<any>(req).pipe(
+      __filter(_r => _r instanceof HttpResponse),
+      __map((_r) => {
+        return _r as __StrictHttpResponse<ResponseArgsOfIQueryResultOfLoyaltyBookingInfoDTO>;
+      })
+    );
+  }
+  /**
+   * Bookings / Buchungen
+   * @param params The `LoyaltyCardService.LoyaltyCardListCustomerBookingsParams` containing the following parameters:
+   *
+   * - `customerId`:
+   *
+   * - `locale`:
+   */
+  LoyaltyCardListCustomerBookings(params: LoyaltyCardService.LoyaltyCardListCustomerBookingsParams): __Observable<ResponseArgsOfIQueryResultOfLoyaltyBookingInfoDTO> {
+    return this.LoyaltyCardListCustomerBookingsResponse(params).pipe(
+      __map(_r => _r.body as ResponseArgsOfIQueryResultOfLoyaltyBookingInfoDTO)
+    );
+  }
+
   /**
    * Booking reason / Buchungsgründe
    */
-  LoyaltyCardBookingReasonResponse(): __Observable<__StrictHttpResponse<ResponseArgsOfIEnumerableOfString>> {
+  LoyaltyCardBookingReasonResponse(): __Observable<__StrictHttpResponse<ResponseArgsOfIEnumerableOfKeyValueDTOOfStringAndInteger>> {
     let __params = this.newParams();
     let __headers = new HttpHeaders();
     let __body: any = null;
@@ -150,16 +197,16 @@ class LoyaltyCardService extends __BaseService {
     return this.http.request<any>(req).pipe(
       __filter(_r => _r instanceof HttpResponse),
       __map((_r) => {
-        return _r as __StrictHttpResponse<ResponseArgsOfIEnumerableOfString>;
+        return _r as __StrictHttpResponse<ResponseArgsOfIEnumerableOfKeyValueDTOOfStringAndInteger>;
       })
     );
   }
   /**
    * Booking reason / Buchungsgründe
    */
-  LoyaltyCardBookingReason(): __Observable<ResponseArgsOfIEnumerableOfString> {
+  LoyaltyCardBookingReason(): __Observable<ResponseArgsOfIEnumerableOfKeyValueDTOOfStringAndInteger> {
     return this.LoyaltyCardBookingReasonResponse().pipe(
-      __map(_r => _r.body as ResponseArgsOfIEnumerableOfString)
+      __map(_r => _r.body as ResponseArgsOfIEnumerableOfKeyValueDTOOfStringAndInteger)
     );
   }
 
@@ -206,7 +253,7 @@ class LoyaltyCardService extends __BaseService {
    *
    * - `locale`:
    */
-  LoyaltyCardLoyaltyBonCheckResponse(params: LoyaltyCardService.LoyaltyCardLoyaltyBonCheckParams): __Observable<__StrictHttpResponse<ResponseArgsOfBoolean>> {
+  LoyaltyCardLoyaltyBonCheckResponse(params: LoyaltyCardService.LoyaltyCardLoyaltyBonCheckParams): __Observable<__StrictHttpResponse<ResponseArgsOfLoyaltyBonResponse>> {
     let __params = this.newParams();
     let __headers = new HttpHeaders();
     let __body: any = null;
@@ -226,7 +273,7 @@ class LoyaltyCardService extends __BaseService {
     return this.http.request<any>(req).pipe(
       __filter(_r => _r instanceof HttpResponse),
       __map((_r) => {
-        return _r as __StrictHttpResponse<ResponseArgsOfBoolean>;
+        return _r as __StrictHttpResponse<ResponseArgsOfLoyaltyBonResponse>;
       })
     );
   }
@@ -240,9 +287,9 @@ class LoyaltyCardService extends __BaseService {
    *
    * - `locale`:
    */
-  LoyaltyCardLoyaltyBonCheck(params: LoyaltyCardService.LoyaltyCardLoyaltyBonCheckParams): __Observable<ResponseArgsOfBoolean> {
+  LoyaltyCardLoyaltyBonCheck(params: LoyaltyCardService.LoyaltyCardLoyaltyBonCheckParams): __Observable<ResponseArgsOfLoyaltyBonResponse> {
     return this.LoyaltyCardLoyaltyBonCheckResponse(params).pipe(
-      __map(_r => _r.body as ResponseArgsOfBoolean)
+      __map(_r => _r.body as ResponseArgsOfLoyaltyBonResponse)
     );
   }
 
@@ -345,6 +392,8 @@ class LoyaltyCardService extends __BaseService {
    * Unlock card
    * @param params The `LoyaltyCardService.LoyaltyCardUnlockCardParams` containing the following parameters:
    *
+   * - `customerId`:
+   *
    * - `cardCode`:
    *
    * - `locale`:
@@ -354,10 +403,11 @@ class LoyaltyCardService extends __BaseService {
     let __headers = new HttpHeaders();
     let __body: any = null;
 
+
     if (params.locale != null) __params = __params.set('locale', params.locale.toString());
     let req = new HttpRequest<any>(
       'POST',
-      this.rootUrl + `/loyalty/${encodeURIComponent(String(params.cardCode))}/unlock`,
+      this.rootUrl + `/customer/${encodeURIComponent(String(params.customerId))}/loyalty/${encodeURIComponent(String(params.cardCode))}/unlock`,
       __body,
       {
         headers: __headers,
@@ -376,6 +426,8 @@ class LoyaltyCardService extends __BaseService {
    * Unlock card
    * @param params The `LoyaltyCardService.LoyaltyCardUnlockCardParams` containing the following parameters:
    *
+   * - `customerId`:
+   *
    * - `cardCode`:
    *
    * - `locale`:
@@ -406,6 +458,14 @@ module LoyaltyCardService {
     locale?: null | string;
   }
 
+  /**
+   * Parameters for LoyaltyCardListCustomerBookings
+   */
+  export interface LoyaltyCardListCustomerBookingsParams {
+    customerId: number;
+    locale?: null | string;
+  }
+
   /**
    * Parameters for LoyaltyCardLoyaltyBonCheck
    */
@@ -436,6 +496,7 @@ module LoyaltyCardService {
    * Parameters for LoyaltyCardUnlockCard
    */
   export interface LoyaltyCardUnlockCardParams {
+    customerId: number;
     cardCode: string;
     locale?: null | string;
   }

generated/swagger/eis-api/project.json

@@ -4,7 +4,14 @@
   "sourceRoot": "generated/swagger/eis-api/src",
   "prefix": "lib",
   "projectType": "library",
-  "tags": ["generated","swagger","eis", "api"],
+  "tags": [
+    "generated",
+    "swagger",
+    "eis",
+    "api",
+    "scope:generated",
+    "type:generated"
+  ],
   "targets": {
     "download": {
       "command": "curl -o {projectRoot}/swagger.json https://filialinformationsystem-test.paragon-systems.de/eiswebapi/v1/swagger.json"
@@ -17,8 +24,12 @@
         "{projectRoot}/ng-swagger-gen.json",
         "!{projectRoot}/src/**/*.ts"
       ],
-      "outputs": ["{projectRoot}/src"],
-      "dependsOn": ["download"],
+      "outputs": [
+        "{projectRoot}/src"
+      ],
+      "dependsOn": [
+        "download"
+      ],
       "cache": false
     }
   }

generated/swagger/inventory-api/project.json

@@ -4,7 +4,14 @@
   "sourceRoot": "generated/swagger/inventory-api/src",
   "prefix": "lib",
   "projectType": "library",
-  "tags": ["generated", "swagger", "inventory", "api"],
+  "tags": [
+    "generated",
+    "swagger",
+    "inventory",
+    "api",
+    "scope:generated",
+    "type:generated"
+  ],
   "targets": {
     "generate": {
       "command": "ng-swagger-gen --config {projectRoot}/ng-swagger-gen.json --output {projectRoot}/src",
@@ -13,7 +20,9 @@
         "{projectRoot}/ng-swagger-gen.json",
         "!{projectRoot}/src/**/*.ts"
       ],
-      "outputs": ["{projectRoot}/src"],
+      "outputs": [
+        "{projectRoot}/src"
+      ],
       "cache": false
     }
   }

generated/swagger/isa-api/project.json

@@ -4,7 +4,14 @@
   "sourceRoot": "generated/swagger/isa-api/src",
   "prefix": "lib",
   "projectType": "library",
-  "tags": ["generated","swagger", "isa", "api"],
+  "tags": [
+    "generated",
+    "swagger",
+    "isa",
+    "api",
+    "scope:generated",
+    "type:generated"
+  ],
   "targets": {
     "generate": {
       "command": "ng-swagger-gen --config {projectRoot}/ng-swagger-gen.json --output {projectRoot}/src",
@@ -13,7 +20,9 @@
         "{projectRoot}/ng-swagger-gen.json",
         "!{projectRoot}/src/**/*.ts"
       ],
-      "outputs": ["{projectRoot}/src"],
+      "outputs": [
+        "{projectRoot}/src"
+      ],
       "cache": false
     }
   }

generated/swagger/oms-api/project.json

@@ -4,7 +4,14 @@
   "sourceRoot": "generated/swagger/oms-api/src",
   "prefix": "lib",
   "projectType": "library",
-  "tags": ["generated","swagger", "oms", "api"],
+  "tags": [
+    "generated",
+    "swagger",
+    "oms",
+    "api",
+    "scope:generated",
+    "type:generated"
+  ],
   "targets": {
     "generate": {
       "command": "ng-swagger-gen --config {projectRoot}/ng-swagger-gen.json --output {projectRoot}/src",
@@ -13,7 +20,9 @@
         "{projectRoot}/ng-swagger-gen.json",
         "!{projectRoot}/src/**/*.ts"
       ],
-      "outputs": ["{projectRoot}/src"],
+      "outputs": [
+        "{projectRoot}/src"
+      ],
       "cache": false
     }
   }

generated/swagger/print-api/project.json

@@ -4,7 +4,14 @@
   "sourceRoot": "generated/swagger/print-api/src",
   "prefix": "lib",
   "projectType": "library",
-  "tags": ["generated","swagger", "print", "api"],
+  "tags": [
+    "generated",
+    "swagger",
+    "print",
+    "api",
+    "scope:generated",
+    "type:generated"
+  ],
   "targets": {
     "generate": {
       "command": "ng-swagger-gen --config {projectRoot}/ng-swagger-gen.json --output {projectRoot}/src",
@@ -13,7 +20,9 @@
         "{projectRoot}/ng-swagger-gen.json",
         "!{projectRoot}/src/**/*.ts"
       ],
-      "outputs": ["{projectRoot}/src"],
+      "outputs": [
+        "{projectRoot}/src"
+      ],
       "cache": false
     }
   }

generated/swagger/wws-api/project.json

@@ -4,7 +4,14 @@
   "sourceRoot": "generated/swagger/wws-api/src",
   "prefix": "lib",
   "projectType": "library",
-  "tags": ["generated","swagger", "wws", "api"],
+  "tags": [
+    "generated",
+    "swagger",
+    "wws",
+    "api",
+    "scope:generated",
+    "type:generated"
+  ],
   "targets": {
     "generate": {
       "command": "ng-swagger-gen --config {projectRoot}/ng-swagger-gen.json --output {projectRoot}/src",
@@ -13,7 +20,9 @@
         "{projectRoot}/ng-swagger-gen.json",
         "!{projectRoot}/src/**/*.ts"
       ],
-      "outputs": ["{projectRoot}/src"],
+      "outputs": [
+        "{projectRoot}/src"
+      ],
       "cache": false
     }
   }