diff --git a/libs/blocks/locui/loc/index.js b/libs/blocks/locui/loc/index.js index 360eac80da..1c9d306786 100644 --- a/libs/blocks/locui/loc/index.js +++ b/libs/blocks/locui/loc/index.js @@ -15,7 +15,7 @@ import { setStatus } from '../utils/status.js'; import { getStatus, preview } from '../utils/franklin.js'; import login from '../../../tools/sharepoint/login.js'; import { getServiceUpdates } from '../utils/miloc.js'; -import { connectAemSK } from '../../../utils/sidekick.js'; +import { connectSK } from '../../../utils/sidekick.js'; const LANG_ACTIONS = ['Translate', 'English Copy', 'Rollout']; const MOCK_REFERRER = 'https%3A%2F%2Fadobe.sharepoint.com%2F%3Ax%3A%2Fr%2Fsites%2Fadobecom%2F_layouts%2F15%2FDoc.aspx%3Fsourcedoc%3D%257B94460FAC-CDEE-4B31-B8E0-AA5E3F45DCC5%257D%26file%3Dwesco-demo.xlsx'; @@ -137,14 +137,14 @@ async function loginToSharePoint() { async function connectSidekick() { return new Promise((resolve) => { - const onConnected = ({ detail }) => { + const onConnect = ({ detail }) => { if (detail?.data?.profile) { user.value = detail.data.profile; resolve(); } setStatus('details', 'info', 'Please sign-in to AEM sidekick.'); }; - connectAemSK(onConnected, () => { + connectSK(onConnect, () => { setStatus('details', 'info', 'Please open AEM sidekick to continue.'); }); }); diff --git a/libs/utils/sidekick.js b/libs/utils/sidekick.js index b4d2b5d8c5..ce6c1439f9 100644 --- a/libs/utils/sidekick.js +++ b/libs/utils/sidekick.js @@ -96,7 +96,7 @@ export default function init({ createTag, loadBlock, loadScript, loadStyle }) { stylePublish(sk); } -function onSidekickAvailable(callback) { +function onSkLoaded(callback) { // sidekick nextGen const observer = new MutationObserver(() => { const sidekick = document.querySelector('aem-sidekick'); @@ -113,15 +113,15 @@ function onSidekickAvailable(callback) { }, { once: true }); } -export function connectAemSK(setStatus, notLoaded = null) { - const isOpen = document.querySelector('helix-sidekick') +export function connectSK(status, standby = null) { + const sidekick = document.querySelector('helix-sidekick') || document.querySelector('aem-sidekick'); - if (isOpen) { - isOpen.addEventListener('statusfetched', setStatus); + if (sidekick) { + sidekick.addEventListener('statusfetched', status); } else { - notLoaded?.(); - onSidekickAvailable((sidekick) => { - sidekick?.addEventListener('statusfetched', setStatus); + standby?.(); + onSkLoaded((sk) => { + sk?.addEventListener('statusfetched', status); }); } }