Skip to content

Commit 568d648

Browse files
authored
CXSPA-9583 apply a more simple fix (#20079) for wrong retract link
1 parent 9cb35f7 commit 568d648

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

feature-libs/product-configurator/rulebased/occ/variant/converters/occ-configurator-variant-normalizer.spec.ts

+15
Original file line numberDiff line numberDiff line change
@@ -1519,6 +1519,21 @@ describe('OccConfiguratorVariantNormalizer', () => {
15191519
);
15201520
});
15211521

1522+
it('should not add a retract value to the list of values for a read-only that is involved in a conflict in case domain is not yet present', () => {
1523+
(configUISettingsConfig.productConfigurator ??= {}).addRetractOption =
1524+
false;
1525+
sourceAttribute.type = OccConfigurator.UiType.READ_ONLY;
1526+
sourceAttribute.conflicts = ['conflict1'];
1527+
sourceAttribute.retractBlocked = false;
1528+
sourceAttribute.domainOnDemand = true;
1529+
1530+
occConfiguratorVariantNormalizer['addRetractValue'](
1531+
sourceAttribute,
1532+
values
1533+
);
1534+
expect(values.length).toEqual(0);
1535+
});
1536+
15221537
it('should add a retract value to the list of values for a read-only-single-selection-image that is involved in a conflict', () => {
15231538
(configUISettingsConfig.productConfigurator ??= {}).addRetractOption =
15241539
false;

feature-libs/product-configurator/rulebased/occ/variant/converters/occ-configurator-variant-normalizer.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,9 @@ export class OccConfiguratorVariantNormalizer
256256
if (!isRetractBlocked) {
257257
if (
258258
this.uiSettingsConfig?.productConfigurator?.addRetractOption ||
259-
(this.isSourceAttributeTypeReadOnly(sourceAttribute) && isConflicting)
259+
(this.isSourceAttributeTypeReadOnly(sourceAttribute) &&
260+
isConflicting &&
261+
!sourceAttribute.domainOnDemand)
260262
) {
261263
const attributeType = this.convertAttributeType(sourceAttribute);
262264
if (

0 commit comments

Comments
 (0)