From 708ec017040a52ac2b524fba02fc2e6e30dfd86b Mon Sep 17 00:00:00 2001 From: Nino Righi Date: Tue, 2 Sep 2025 15:20:44 +0000 Subject: [PATCH] Merged PR 1931: fix(remission-quantity-and-reason-item) fix(remission-quantity-and-reason-item) Ref: #5292 --- .../shared/product/product-info.stories.ts | 12 + .../product-info/product-info.component.html | 4 +- .../product-info/product-info.component.ts | 7 +- ...search-item-to-remit-dialog.component.html | 2 +- ...search-item-to-remit-dialog.component.scss | 2 +- ...rch-item-to-remit-dialog.component.spec.ts | 377 ------------------ .../search-item-to-remit-list.component.html | 13 +- .../search-item-to-remit-list.component.ts | 10 +- .../lib/search-item-to-remit.component.html | 1 + 9 files changed, 39 insertions(+), 389 deletions(-) delete mode 100644 libs/remission/shared/search-item-to-remit-dialog/src/lib/search-item-to-remit-dialog.component.spec.ts diff --git a/apps/isa-app/stories/remission/shared/product/product-info.stories.ts b/apps/isa-app/stories/remission/shared/product/product-info.stories.ts index 624bb8ffa..9c74ff4fe 100644 --- a/apps/isa-app/stories/remission/shared/product/product-info.stories.ts +++ b/apps/isa-app/stories/remission/shared/product/product-info.stories.ts @@ -17,6 +17,7 @@ import { provideRouter } from '@angular/router'; type ProductInfoInputs = { item: ProductInfoItem; orientation: ProductInfoOrientation; + innerGridClass: string; }; const meta: Meta = { @@ -53,6 +54,7 @@ const meta: Meta = { tag: 'Prio 2', }, orientation: 'horizontal', + innerGridClass: 'grid-cols-[minmax(20rem,1fr),auto]', }, argTypes: { item: { @@ -69,6 +71,16 @@ const meta: Meta = { }, }, }, + innerGridClass: { + control: 'text', + description: + 'Custom CSS classes for the inner grid layout. (Applies on vertical layout only)', + table: { + defaultValue: { + summary: 'grid-cols-[minmax(20rem,1fr),auto]', + }, + }, + }, }, render: (args) => ({ props: args, diff --git a/libs/remission/shared/product/src/lib/product-info/product-info.component.html b/libs/remission/shared/product/src/lib/product-info/product-info.component.html index 36428fff9..cf6b368b3 100644 --- a/libs/remission/shared/product/src/lib/product-info/product-info.component.html +++ b/libs/remission/shared/product/src/lib/product-info/product-info.component.html @@ -25,11 +25,11 @@
diff --git a/libs/remission/shared/product/src/lib/product-info/product-info.component.ts b/libs/remission/shared/product/src/lib/product-info/product-info.component.ts index 0c9d86c38..3a1c219b4 100644 --- a/libs/remission/shared/product/src/lib/product-info/product-info.component.ts +++ b/libs/remission/shared/product/src/lib/product-info/product-info.component.ts @@ -1,6 +1,6 @@ -import { CurrencyPipe } from '@angular/common'; +import { CurrencyPipe, NgClass } from '@angular/common'; import { Component, input } from '@angular/core'; -import { RemissionItem, ReturnItem } from '@isa/remission/data-access'; +import { RemissionItem } from '@isa/remission/data-access'; import { ProductImageDirective } from '@isa/shared/product-image'; import { ProductRouterLinkDirective } from '@isa/shared/product-router-link'; import { ProductFormatComponent } from '@isa/shared/product-foramt'; @@ -23,6 +23,7 @@ export const RemissionItemTags = { selector: 'remi-product-info', templateUrl: 'product-info.component.html', imports: [ + NgClass, ProductImageDirective, ProductRouterLinkDirective, CurrencyPipe, @@ -50,4 +51,6 @@ export class ProductInfoComponent { item = input.required(); orientation = input('horizontal'); + + innerGridClass = input('grid-cols-[minmax(20rem,1fr),auto]'); } diff --git a/libs/remission/shared/search-item-to-remit-dialog/src/lib/search-item-to-remit-dialog.component.html b/libs/remission/shared/search-item-to-remit-dialog/src/lib/search-item-to-remit-dialog.component.html index 1698f389d..39083b2fc 100644 --- a/libs/remission/shared/search-item-to-remit-dialog/src/lib/search-item-to-remit-dialog.component.html +++ b/libs/remission/shared/search-item-to-remit-dialog/src/lib/search-item-to-remit-dialog.component.html @@ -2,7 +2,7 @@ } @else {

@if (searchResource.value()?.result; as items) { @for (item of items; track item.id) { @defer { -