Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
davenichols-DHLS authored Dec 17, 2024
2 parents 926283b + 9f6aebc commit f8b3efa
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 4 deletions.
1 change: 0 additions & 1 deletion .github/workflows/deploy-converter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
${{ runner.os }}-build-
${{ runner.os }}-
- run: npm ci
- run: npm run converter:test
- run: npm run converter:build:prod
- run: npm run converter:deploy -- convert/${ACTION_NAME}
env:
Expand Down
4 changes: 2 additions & 2 deletions converter.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# the origin to fetch content from
origin: https://author-p93411-e849602.adobeaemcloud.com
origin: https://author-p93411-e849552.adobeaemcloud.com/
suffix: ".html?wcmmode=disabled"
internalHost: https://main--danaher-ls-aem--hlxsites.hlx.live
internalHost: https://main--danaher-ls-aem-prod--hlxsites.hlx.live
# the live urls of the content
# this is used to make absolute links to the urls domain reliatve
# it may be an array, if there are mutliple urls possible like
Expand Down
2 changes: 1 addition & 1 deletion fstab.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
mountpoints:
/:
url: https://1050314-569danaherxwalk-stage.adobeioruntime.net/api/v1/web/convert/main/
url: https://1050314-569danaherxwalk.adobeioruntime.net/api/v1/web/convert/main/
type: markup
suffix: ".html?wcmmode=disabled"

Expand Down
25 changes: 25 additions & 0 deletions scripts/delayed.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,31 @@ function loadGTM() {
}
// google tag manager -end

// SalesForce MCP - start

function loadEvergageScript() {
const script = document.createElement('script');
if (window.location.host === 'lifesciences.danaher.com') {
script.src = 'https://cdn.evgnet.com/beacon/v55685555553mx3rf3h3n3n3i091550196/danaher_ls_prod/scripts/evergage.min.js';
} else {
script.src = 'https://cdn.evgnet.com/beacon/v55685555553mx3rf3h3n3n3i091550196/danaher_ls_staging/scripts/evergage.min.js';
}
script.onload = function onEvergageLoad() {
};
script.onerror = function onEvergageError() {
};
document.head.appendChild(script);
}

/* eslint-disable no-console */
setTimeout(() => {
if (typeof OnetrustActiveGroups !== 'undefined' && OnetrustActiveGroups.includes("C0004")) {
loadEvergageScript();
}
}, 3000);

// SalesForce MCP - end

// Adobe Target - start

window.targetGlobalSettings = {
Expand Down

0 comments on commit f8b3efa

Please sign in to comment.