From e86a8868e172f335b420a9e0195be3f7f7edac76 Mon Sep 17 00:00:00 2001 From: Jason Slavin Date: Thu, 5 Dec 2024 02:29:11 -0800 Subject: [PATCH] Revert "MWPW-155723 - Adds group metadata to ensure dyanmic nav continuity " (#3308) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revert "MWPW-155723 - Adds group metadata to ensure dyanmic nav continuity (…" This reverts commit 22dab6644861e52865ab288c0149d91b912823b3. --- .../dynamic-navigation/dynamic-navigation.js | 14 ---- libs/features/dynamic-navigation/status.js | 8 +-- test/features/dynamic-nav/dynamicNav.test.js | 30 -------- test/features/dynamic-nav/status.test.js | 70 +------------------ 4 files changed, 2 insertions(+), 120 deletions(-) diff --git a/libs/features/dynamic-navigation/dynamic-navigation.js b/libs/features/dynamic-navigation/dynamic-navigation.js index 7d943cc597..7354518a58 100644 --- a/libs/features/dynamic-navigation/dynamic-navigation.js +++ b/libs/features/dynamic-navigation/dynamic-navigation.js @@ -14,30 +14,16 @@ export function foundDisableValues() { return foundValues.length ? foundValues : false; } -function dynamicNavGroupMatches(groupMetaData) { - const storedGroup = window.sessionStorage.getItem('dynamicNavGroup'); - if (groupMetaData && storedGroup) { - return storedGroup.toLowerCase() === groupMetaData.toLowerCase(); - } - return false; -} - export default function dynamicNav(url, key) { if (foundDisableValues()) return url; const metadataContent = getMetadata('dynamic-nav'); - const dynamicNavGroup = getMetadata('dynamic-nav-group'); if (metadataContent === 'entry') { window.sessionStorage.setItem('gnavSource', url); window.sessionStorage.setItem('dynamicNavKey', key); - if (dynamicNavGroup) window.sessionStorage.setItem('dynamicNavGroup', dynamicNavGroup); return url; } - if (metadataContent === 'on' && dynamicNavGroup) { - if (!dynamicNavGroupMatches(dynamicNavGroup)) return url; - } - if (metadataContent !== 'on' || key !== window.sessionStorage.getItem('dynamicNavKey')) return url; return window.sessionStorage.getItem('gnavSource') || url; diff --git a/libs/features/dynamic-navigation/status.js b/libs/features/dynamic-navigation/status.js index 3321459581..792f586765 100644 --- a/libs/features/dynamic-navigation/status.js +++ b/libs/features/dynamic-navigation/status.js @@ -80,11 +80,7 @@ const createStatusWidget = (dynamicNavKey) => { const currentSource = getCurrentSource(dynamicNavSetting, storedSource, authoredSource); const dynamicNavDisableValues = getMetadata('dynamic-nav-disable'); const foundValues = foundDisableValues(); - const groupMetaSetting = getMetadata('dynamic-nav-group') || 'Group not set'; - const groupsMatch = groupMetaSetting.toLowerCase() === window.sessionStorage.getItem('dynamicNavGroup').toLowerCase(); - const groupsMatchMessage = groupsMatch ? 'Yes' : 'No'; - const isDisabled = foundValues.length >= 1 || (!groupsMatch && groupMetaSetting !== 'Group not set'); - const status = getStatus(dynamicNavSetting, isDisabled, storedSource); + const status = getStatus(dynamicNavSetting, foundValues.length >= 1, storedSource); const statusWidget = createTag('div', { class: 'dynamic-nav-status' }); statusWidget.innerHTML = ` @@ -98,8 +94,6 @@ const createStatusWidget = (dynamicNavKey) => {

Status: ${status}

Setting: ${dynamicNavSetting}

-

Group: ${groupMetaSetting}

-

Group matches stored group: ${groupsMatchMessage}

Consumer key: ${dynamicNavKey}

Authored and stored source match: ${authoredSource === currentSource}

diff --git a/test/features/dynamic-nav/dynamicNav.test.js b/test/features/dynamic-nav/dynamicNav.test.js index 710b9c78e2..a08c98ba22 100644 --- a/test/features/dynamic-nav/dynamicNav.test.js +++ b/test/features/dynamic-nav/dynamicNav.test.js @@ -58,24 +58,6 @@ describe('Dynamic nav', () => { expect(url).to.equal('gnav/aem-sites'); }); - it('Returns the provided url when the group has not been set', async () => { - document.head.innerHTML = await readFile({ path: './mocks/on.html' }); - const url = dynamicNav('gnav/aem-sites', 'bacom'); - expect(url).to.equal('some-source-string'); - }); - - it('Returns the provided url when the group does not match', async () => { - document.head.innerHTML = await readFile({ path: './mocks/on.html' }); - const groupMeta = document.createElement('meta'); - groupMeta.setAttribute('name', 'dynamic-nav-group'); - groupMeta.setAttribute('content', 'test'); - document.head.appendChild(groupMeta); - - window.sessionStorage.setItem('dynamicNavGroup', 'no-test'); - const url = dynamicNav('gnav/aem-sites', 'bacom'); - expect(url).to.equal('gnav/aem-sites'); - }); - it('Returns the sessionStorage url when dynamic nav ignore items are present but do not match the metadata', async () => { document.head.innerHTML = await readFile({ path: './mocks/on-ignore-does-not-match.html' }); const url = dynamicNav('gnav/aem-sites', 'bacom'); @@ -93,16 +75,4 @@ describe('Dynamic nav', () => { const url = dynamicNav('gnav/aem-sites', 'bacom'); expect(url).to.equal('some-source-string'); }); - - it('Returns the sessionStorage url when the groups match', async () => { - document.head.innerHTML = await readFile({ path: './mocks/on.html' }); - const groupMeta = document.createElement('meta'); - groupMeta.setAttribute('name', 'dynamic-nav-group'); - groupMeta.setAttribute('content', 'test'); - document.head.appendChild(groupMeta); - - window.sessionStorage.setItem('dynamicNavGroup', 'test'); - const url = dynamicNav('gnav/aem-sites', 'bacom'); - expect(url).to.equal('some-source-string'); - }); }); diff --git a/test/features/dynamic-nav/status.test.js b/test/features/dynamic-nav/status.test.js index 6d43ae23a2..2b9a261e61 100644 --- a/test/features/dynamic-nav/status.test.js +++ b/test/features/dynamic-nav/status.test.js @@ -23,8 +23,7 @@ describe('Dynamic Nav Status', () => { beforeEach(async () => { const conf = { dynamicNavKey: 'bacom' }; document.body.innerHTML = await readFile({ path: './mocks/status.html' }); - document.head.innerHTML = ''; - window.sessionStorage.setItem('dynamicNavGroup', 'test'); + document.head.innerHTML = ''; setConfig(conf); }); @@ -160,73 +159,6 @@ describe('Dynamic Nav Status', () => { expect(info.authoredSource).to.equal('/test'); expect(info.storedSource).to.equal('/test'); }); - - it('displays the correct information for a group match', () => { - document.querySelector('meta[name="dynamic-nav"]').setAttribute('content', 'on'); - document.querySelector('meta[name="gnav-source"]').setAttribute('content', 'https://main--milo--adobecom.hlx/test'); - - dynamicNav(); - status(); - - const statusWidget = document.querySelector('.dynamic-nav-status'); - const group = statusWidget.querySelector('.group span'); - const groupMatch = statusWidget.querySelector('.group-match span'); - - expect(group.innerText).to.equal('test'); - expect(groupMatch.innerText).to.equal('Yes'); - expect(statusWidget.classList.contains(ENABLED)).to.be.true; - }); - - it('displays the correct information for a group mismatch', () => { - document.querySelector('meta[name="dynamic-nav"]').setAttribute('content', 'on'); - document.querySelector('meta[name="gnav-source"]').setAttribute('content', 'https://main--milo--adobecom.hlx/test'); - - window.sessionStorage.setItem('dynamicNavGroup', 'no-test'); - - dynamicNav(); - status(); - - const statusWidget = document.querySelector('.dynamic-nav-status'); - const group = statusWidget.querySelector('.group span'); - const groupMatch = statusWidget.querySelector('.group-match span'); - - expect(group.innerText).to.equal('test'); - expect(groupMatch.innerText).to.equal('No'); - expect(statusWidget.classList.contains(INACTIVE)).to.be.true; - }); - - it('displays the correct information for no group being set', () => { - document.querySelector('meta[name="dynamic-nav"]').setAttribute('content', 'on'); - document.querySelector('meta[name="gnav-source"]').setAttribute('content', 'https://main--milo--adobecom.hlx/test'); - - document.querySelector('meta[name="dynamic-nav-group"]').remove(); - window.sessionStorage.setItem('dynamicNavGroup', 'no-test'); - - dynamicNav(); - status(); - - const statusWidget = document.querySelector('.dynamic-nav-status'); - const group = statusWidget.querySelector('.group span'); - const groupMatch = statusWidget.querySelector('.group-match span'); - - expect(group.innerText).to.equal('Group not set'); - expect(groupMatch.innerText).to.equal('No'); - }); - - it('remains active when there is no group match but the nav is active', () => { - document.querySelector('meta[name="dynamic-nav"]').setAttribute('content', 'on'); - document.querySelector('meta[name="gnav-source"]').setAttribute('content', 'https://main--milo--adobecom.hlx/test'); - - document.querySelector('meta[name="dynamic-nav-group"]').remove(); - window.sessionStorage.setItem('dynamicNavGroup', 'no-test'); - window.sessionStorage.setItem('gnavSource', GNAV_SOURCE); - - dynamicNav(); - status(); - - const statusWidget = document.querySelector('.dynamic-nav-status'); - expect(statusWidget.classList.contains(ACTIVE)).to.be.true; - }); }); describe('disabled values', () => {