Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MWPW-161871 [MEP] useblockcode action fails if page is on milo site #3161

Merged
merged 14 commits into from
Nov 8, 2024
Merged

MWPW-161871 [MEP] useblockcode action fails if page is on milo site #3161

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2e6612d
stash
vgoodric Oct 7, 2024
22b9995
ready to publish
vgoodric Oct 9, 2024
e8ed916
interact call coming back but timing out
vgoodric Oct 9, 2024
592b07e
working on a fast connection
vgoodric Oct 9, 2024
4f6c03d
clean up ifs
vgoodric Oct 9, 2024
f9531e1
working with promise
vgoodric Oct 10, 2024
250248a
Merge branch 'stage' into meppostlcp
vgoodric Oct 11, 2024
f7576c4
use camel case on let variable
vgoodric Oct 14, 2024
4b6771b
unit tests
vgoodric Oct 15, 2024
f920d67
update unit tests
vgoodric Oct 16, 2024
e83d934
MWPW-149504 [MILO][MEP] Move entitlements object to the same JSON fil…
vgoodric Oct 23, 2024
0e83b83
initial commit
vgoodric Oct 24, 2024
3c386bf
Fix useblock code issue
markpadbe Oct 28, 2024
19b83ff
Merge branch 'stage' into mepblockcodemilo
markpadbe Nov 7, 2024
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
6 changes: 3 additions & 3 deletions libs/features/personalization/personalization.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,15 +242,15 @@ const fetchData = async (url, type = DATA_TYPE.JSON) => {
return null;
};

const getBlockProps = (fVal, miloLibs, origin) => {
const getBlockProps = (fVal, config, origin) => {
let val = fVal;
if (val?.includes('\\')) val = val?.split('\\').join('/');
if (!val?.startsWith('/')) val = `/${val}`;
const blockSelector = val?.split('/').pop();

if (val.startsWith('/libs/')) {
/* c8 ignore next 1 */
val = `${miloLibs}${val.replace('/libs', '')}`;
val = `${config.miloLibs || config.codeRoot}${val.replace('/libs', '')}`;
} else {
val = `${origin}${val}`;
}
Expand Down Expand Up @@ -593,7 +593,7 @@ const getVariantInfo = (line, variantNames, variants, manifestPath, fTargetId) =
variants[vn][action] = variants[vn][action] || [];

if (action === 'useblockcode') {
const { blockSelector, blockTarget } = getBlockProps(line[vn], config.miloLibs, origin);
const { blockSelector, blockTarget } = getBlockProps(line[vn], config, origin);
variants[vn][action].push({
selector: blockSelector,
val: blockTarget,
Expand Down
Loading