feat: use ICM settings from configurations call

intershop · Nov 29, 2023 · 461ac20 · 461ac20
1 parent b3f5197
commit 461ac20
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/...ine-item/line-item-extended-content-entry/line-item-extended-content-entry.component.html b/...ine-item/line-item-extended-content-entry/line-item-extended-content-entry.component.html
@@ -1,4 +1,4 @@
-<div class="line-item-attribute" *ngIf="editable || control.value">
+<div class="line-item-attribute" *ngIf="('basket.' + key | ishServerSetting) && (editable || control.value)">
   <ng-template #display>
     <!-- keep-localization-pattern: ^line-item\..*\.placeholder$ -->
     {{ control.value || 'line-item.' + key + '.placeholder' | translate }}

diff --git a/...-item/line-item-extended-content-entry/line-item-extended-content-entry.component.spec.ts b/...-item/line-item-extended-content-entry/line-item-extended-content-entry.component.spec.ts
@@ -1,8 +1,9 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
-import { MockComponent } from 'ng-mocks';
+import { MockComponent, MockPipe } from 'ng-mocks';
 
+import { ServerSettingPipe } from 'ish-core/pipes/server-setting.pipe';
 import { findAllCustomElements } from 'ish-core/utils/dev/html-query-utils';
 import { InPlaceEditComponent } from 'ish-shared/components/common/in-place-edit/in-place-edit.component';
 
@@ -12,11 +13,18 @@ describe('Line Item Extended Content Entry Component', () => {
   let component: LineItemExtendedContentEntryComponent;
   let fixture: ComponentFixture<LineItemExtendedContentEntryComponent>;
   let element: HTMLElement;
+  let settingEnabled: boolean;
 
   beforeEach(async () => {
+    settingEnabled = true;
+
     await TestBed.configureTestingModule({
       imports: [ReactiveFormsModule, TranslateModule.forRoot()],
-      declarations: [LineItemExtendedContentEntryComponent, MockComponent(InPlaceEditComponent)],
+      declarations: [
+        LineItemExtendedContentEntryComponent,
+        MockComponent(InPlaceEditComponent),
+        MockPipe(ServerSettingPipe, () => settingEnabled),
+      ],
     }).compileComponents();
   });
 
@@ -32,6 +40,19 @@ describe('Line Item Extended Content Entry Component', () => {
     expect(() => fixture.detectChanges()).not.toThrow();
   });
 
+  describe('with disabled setting', () => {
+    beforeEach(() => {
+      settingEnabled = false;
+    });
+
+    it('should not display', () => {
+      component.ngOnChanges();
+      fixture.detectChanges();
+
+      expect(element).toMatchInlineSnapshot(`N/A`);
+    });
+  });
+
   describe('with line item', () => {
     beforeEach(() => {
       component.lineItem = {

diff --git a/.../line-item/line-item-extended-content-entry/line-item-extended-content-entry.component.ts b/.../line-item/line-item-extended-content-entry/line-item-extended-content-entry.component.ts
@@ -23,7 +23,9 @@ export class LineItemExtendedContentEntryComponent implements OnChanges {
   }
 
   reset() {
-    this.control.setValue(this.lineItem[this.key]);
+    if (this.lineItem && this.key) {
+      this.control.setValue(this.lineItem[this.key]);
+    }
   }
 
   update() {

diff --git a/src/environments/environment.b2b.ts b/src/environments/environment.b2b.ts
@@ -12,7 +12,6 @@ export const environment: Environment = {
     ...ENVIRONMENT_DEFAULTS.features,
     'businessCustomerRegistration',
     'costCenters',
-    'extendedLineItemContent',
     'maps',
     'messageToMerchant',
     'punchout',

diff --git a/src/environments/environment.model.ts b/src/environments/environment.model.ts
@@ -35,7 +35,6 @@ export interface Environment {
     /* B2B features */
     | 'businessCustomerRegistration'
     | 'costCenters'
-    | 'extendedLineItemContent'
     | 'messageToMerchant'
     | 'quoting'
     | 'quickorder'