Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
variant_data: {
variant: string;
highlightVariantFields: boolean;
variantOrder: string[];
};
};
}
Expand All @@ -34,9 +35,26 @@
locale: string;
};
}

function isLowerOrderVariant(variant_uid: string, dataCslp: string, variantOrder: string[]): boolean {
const indexOfVariant = variantOrder.indexOf(variant_uid);

Check failure on line 40 in src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts

View workflow job for this annotation

GitHub Actions / test

src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts > addVariantFieldClass > should not add highlight class when highlightVariantFields is false

TypeError: Cannot read properties of undefined (reading 'indexOf') ❯ isLowerOrderVariant src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:40:41 ❯ src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:73:18 ❯ Module.addVariantFieldClass src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:60:14 ❯ src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts:373:9

Check failure on line 40 in src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts

View workflow job for this annotation

GitHub Actions / test

src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts > addVariantFieldClass > should not add highlight class when highlightVariantFields is false

TypeError: Cannot read properties of undefined (reading 'indexOf') ❯ isLowerOrderVariant src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:40:41 ❯ src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:73:18 ❯ Module.addVariantFieldClass src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:60:14 ❯ src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts:373:9

Check failure on line 40 in src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts

View workflow job for this annotation

GitHub Actions / test

src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts > addVariantFieldClass > should not add highlight class when highlightVariantFields is false

TypeError: Cannot read properties of undefined (reading 'indexOf') ❯ isLowerOrderVariant src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:40:41 ❯ src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:73:18 ❯ Module.addVariantFieldClass src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:60:14 ❯ src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts:373:9

Check failure on line 40 in src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts

View workflow job for this annotation

GitHub Actions / test

src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts > addVariantFieldClass > should add classes to elements correctly based on data-cslp attribute

TypeError: Cannot read properties of undefined (reading 'indexOf') ❯ isLowerOrderVariant src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:40:41 ❯ src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:73:18 ❯ Module.addVariantFieldClass src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:60:14 ❯ src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts:342:9

Check failure on line 40 in src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts

View workflow job for this annotation

GitHub Actions / test

src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts > addVariantFieldClass > should add classes to elements correctly based on data-cslp attribute

TypeError: Cannot read properties of undefined (reading 'indexOf') ❯ isLowerOrderVariant src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:40:41 ❯ src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:73:18 ❯ Module.addVariantFieldClass src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:60:14 ❯ src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts:342:9

Check failure on line 40 in src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts

View workflow job for this annotation

GitHub Actions / test

src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts > addVariantFieldClass > should add classes to elements correctly based on data-cslp attribute

TypeError: Cannot read properties of undefined (reading 'indexOf') ❯ isLowerOrderVariant src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:40:41 ❯ src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:73:18 ❯ Module.addVariantFieldClass src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:60:14 ❯ src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts:342:9

Check failure on line 40 in src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts

View workflow job for this annotation

GitHub Actions / test

src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts > useVariantFieldsPostMessageEvent > should handle SHOW_VARIANT_FIELDS event

TypeError: Cannot read properties of undefined (reading 'indexOf') ❯ isLowerOrderVariant src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:40:41 ❯ src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:73:18 ❯ addVariantFieldClass src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:60:14 ❯ src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:148:13 ❯ src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts:240:9

Check failure on line 40 in src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts

View workflow job for this annotation

GitHub Actions / test

src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts > useVariantFieldsPostMessageEvent > should handle SHOW_VARIANT_FIELDS event

TypeError: Cannot read properties of undefined (reading 'indexOf') ❯ isLowerOrderVariant src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:40:41 ❯ src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:73:18 ❯ addVariantFieldClass src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:60:14 ❯ src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:148:13 ❯ src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts:240:9

Check failure on line 40 in src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts

View workflow job for this annotation

GitHub Actions / test

src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts > useVariantFieldsPostMessageEvent > should handle SHOW_VARIANT_FIELDS event

TypeError: Cannot read properties of undefined (reading 'indexOf') ❯ isLowerOrderVariant src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:40:41 ❯ src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:73:18 ❯ addVariantFieldClass src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:60:14 ❯ src/visualBuilder/eventManager/useVariantsPostMessageEvent.ts:148:13 ❯ src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts:240:9
let indexOfDataCslp = -1;
for (let i = variantOrder.length-1; i >= 0; i--) {
if (dataCslp.includes(variantOrder[i])) {
indexOfDataCslp = i;
break;
}
}
if(indexOfDataCslp < 0) {
return false;
}
return indexOfDataCslp < indexOfVariant;
}

export function addVariantFieldClass(
variant_uid: string,
highlightVariantFields: boolean
highlightVariantFields: boolean,
variantOrder: string[]
): void {
const elements = document.querySelectorAll(`[data-cslp]`);
elements.forEach((element) => {
Expand All @@ -51,7 +69,11 @@
element.classList.add("visual-builder__variant-field");
} else if (!dataCslp.startsWith("v2:")) {
element.classList.add("visual-builder__base-field");
} else {
}
else if (isLowerOrderVariant(variant_uid, dataCslp, variantOrder)) {
element.classList.add("visual-builder__variant-field");
}
else {
element.classList.add("visual-builder__disabled-variant-field");
}
});
Expand Down Expand Up @@ -125,7 +147,8 @@
removeVariantFieldClass();
addVariantFieldClass(
event.data.variant_data.variant,
event.data.variant_data.highlightVariantFields
event.data.variant_data.highlightVariantFields,
event.data.variant_data.variantOrder
);
}
);
Expand Down
Loading