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.

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

MWPW-157147: Dynamic Nav Status Button #2920

Merged
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion libs/blocks/global-navigation/global-navigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,7 @@ const getSource = async () => {
const { locale, dynamicNavKey } = getConfig();
let url = getMetadata('gnav-source') || `${locale.contentRoot}/gnav`;
if (dynamicNavKey) {
const { default: dynamicNav } = await import('../../features/dynamic-navigation.js');
const { default: dynamicNav } = await import('../../features/dynamic-navigation/dynamic-navigation.js');
url = dynamicNav(url, dynamicNavKey);
}
return url;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
import { getMetadata } from '../utils/utils.js';
import { getMetadata } from '../../utils/utils.js';

function isDynamicNavDisabled() {
export function foundDisableValues() {
const dynamicNavDisableValues = getMetadata('dynamic-nav-disable');
if (!dynamicNavDisableValues) return false;

const metadataPairsMap = dynamicNavDisableValues.split(',').map((pair) => pair.split(';'));
return metadataPairsMap.some(([metadataKey, metadataContent]) => {
const foundValues = metadataPairsMap.filter(([metadataKey, metadataContent]) => {
const metaTagContent = getMetadata(metadataKey.toLowerCase());
return (metaTagContent
&& metaTagContent.toLowerCase() === metadataContent.toLowerCase());
});

return foundValues.length ? foundValues : false;
}

export default function dynamicNav(url, key) {
if (isDynamicNavDisabled()) return url;
if (foundDisableValues()) return url;
const metadataContent = getMetadata('dynamic-nav');

if (metadataContent === 'entry') {
Expand Down
179 changes: 179 additions & 0 deletions libs/features/dynamic-navigation/status.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
.dynamic-nav-status {
border: 2px solid white;
border-radius: 32px;
color: #eee;
font-size: 16px;
padding: 12px 24px;
cursor: pointer;
display: flex;
align-items: center;
margin: 12px;
position: relative;
}

.dynamic-nav-status .title {
display: flex;
}

.dynamic-nav-status.active {
background-color: #280;
}

.dynamic-nav-status.enabled {
background-color: #ec4;
}

.dynamic-nav-status.inactive {
background-color: #e20;
}

.dns-badge {
border: 2px solid white;
border-radius: 32px;
background-color: transparent;
box-sizing: border-box;
color: #eee;
padding: 8px;
height: 12px;
width: 12px;
margin: 4px 8px 4px 0;
cursor: pointer;
display: flex;
align-items: center;
position: relative;
}

.dns-badge::after {
content: '';
display: block;
box-sizing: border-box;
position: absolute;
width: 6px;
height: 6px;
border-top: 2px solid;
border-right: 2px solid;
transform: rotate(45deg);
left: 5px;
bottom: 5px;
transition-duration: 0.2s;
}

.dns-badge.dns-open::after {
transform: rotate(135deg);
transition-duration: 0.2s;
}

.dynamic-nav-status .hidden {
display: none;
}

.dynamic-nav-status.enabled .title,
.dynamic-nav-status.enabled .dns-badge {
color: var(--feds-color-hamburger);
border-color: var(--feds-color-hamburger);
}

.dynamic-nav-status .dns-close-container {
display: flex;
justify-content: flex-end;
width: 100%;
height: 10px;
padding: 2px;
}

.dynamic-nav-status .dns-close {
cursor: pointer;
display: block;
position: absolute;
border: 2px solid white;
border-radius: 32px;
background-color: transparent;
color: #eee;
height: 20px;
width: 20px;
top: 6px;
right: 6px;
box-sizing: border-box;
}

.dynamic-nav-status .dns-close::after {
content: 'x';
display: block;
box-sizing: border-box;
position: absolute;
width: 6px;
height: 6px;
left: 4px;
top: -8px;
font-size: 18px;
font-weight: 600;
}

.dynamic-nav-status .details {
position: absolute;
top: 60px;
right: 0;
background-color: #444;
min-width: 300px;
border-radius: 16px;
box-shadow: 0 0 10px #000;
font-size: 12px;
padding: 20px;
z-index: 1;
}

.dynamic-nav-status .details::before {
content: '';
width: 0;
height: 0;
position: absolute;
border-left: 15px solid transparent;
border-right: 15px solid transparent;
border-top: 15px solid #444;
top: -15px;
right: 75px;
rotate: 180deg;
}

.dynamic-nav-status p {
margin: 2px;
}

.dynamic-nav-status .details p {
font-weight: 600;
}

.dynamic-nav-status .details span {
font-weight: 300;
}

.dynamic-nav-status .details .additional-info {
border-bottom: 1px solid white;
}

.dynamic-nav-status .disable-values {
min-width: 100%;
}

.dynamic-nav-status .disable-values table {
border-collapse: collapse;
width: 100%;
}

.dynamic-nav-status .disable-values caption {
min-width: 100%;
text-align: left;
font-weight: 600;
}

.dynamic-nav-status .disable-values th,
.dynamic-nav-status .disable-values td {
border: 1px solid rgb(160 160 160);
padding: 8px 10px;
}

@media screen and (max-width: 600px) {
.dynamic-nav-status {
display: none;
}
}
133 changes: 133 additions & 0 deletions libs/features/dynamic-navigation/status.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
import { createTag, getConfig, getMetadata } from '../../utils/utils.js';
import { foundDisableValues } from './dynamic-navigation.js';

export const ACTIVE = 'active';
export const ENABLED = 'enabled';
export const INACTIVE = 'inactive';
export const tooltipInfo = {
active: 'Displayed in green, this status appears when a user is on an entry page or a page with the Dynamic Nav enabled, indicating that the nav is fully functioning.',
enabled: 'Displayed in yellow, this status indicates that the Dynamic Nav is set to "on," but the user has not yet visited an entry page.',
inactive: 'Displayed in red, this status indicates that the Dynamic Nav is either not configured or has been disabled.',
};

const getCurrentSource = (status, storageSource, authoredSource) => {
if (status === 'on') {
return storageSource || authoredSource;
}
return authoredSource;
};

const getStatus = (status, disabled, storageSource) => {
if (status === 'entry') return ACTIVE;

if (disabled) return INACTIVE;

if (status === 'on' && storageSource) return ACTIVE;

if (status === 'on' && !storageSource) return ENABLED;

return INACTIVE;
};

const processDisableValues = (valueStr, elem, foundValues = false) => {
if (!valueStr || valueStr.length === 0) return;

const disableValueList = valueStr.split(',');
const table = createTag('table');
const flatValues = Array.isArray(foundValues) && foundValues.flat();

table.innerHTML = `
<caption>Disable Values</caption>
<thead>
<tr>
<th>Key</th>
<th>Value</th>
<th>Match?</th>
</tr>
</thead>
<tbody>
</tbody>`;

const tBody = table.querySelector('tbody');

disableValueList.forEach((pair) => {
const itemRow = createTag('tr');
const [key, value] = pair.split(';');
const keyElem = createTag('td');
const valElem = createTag('td');
const matchElem = createTag('td');
keyElem.innerText = key;
valElem.innerText = value;
matchElem.innerText = flatValues && flatValues.includes(value) ? 'yes' : 'no';

itemRow.append(keyElem, valElem, matchElem);
tBody.append(itemRow);
});

elem.append(table);
};

const returnPath = (url) => {
if (!url.startsWith('https://')) return '';
const sourceUrl = new URL(url);
return sourceUrl.pathname;
};

const createStatusWidget = (dynamicNavKey) => {
const storedSource = window.sessionStorage.getItem('gnavSource');
const authoredSource = getMetadata('gnav-source') || 'Metadata not found: site gnav source';
const dynamicNavSetting = getMetadata('dynamic-nav');
const currentSource = getCurrentSource(dynamicNavSetting, storedSource, authoredSource);
const dynamicNavDisableValues = getMetadata('dynamic-nav-disable');
const foundValues = foundDisableValues();
const status = getStatus(dynamicNavSetting, foundValues.length >= 1, storedSource);
const statusWidget = createTag('div', { class: 'dynamic-nav-status' });

statusWidget.innerHTML = `
<span class="title"><span class="dns-badge"></span>Dynamic Nav</span>
<section class="details hidden">
<span class="dns-close"></span>
<div class="message additional-info">
<p>Additional Info:
<span>${tooltipInfo[status]}</span>
</p>
</div>
<p class="status">Status: <span>${status}</span></p>
<p class="setting">Setting: <span>${dynamicNavSetting}</span></p>
<p class="consumer-key">Consumer key: <span>${dynamicNavKey}</span></p>
<div class="nav-source-info">
<p>Authored and stored source match: <span>${authoredSource === currentSource}</span></p>
<p>Authored Nav Source:
<span>${returnPath(authoredSource)}</span></p>
<p>Stored Nav Source:
<span>${returnPath(currentSource)}</span></p>
</div>
<div class="disable-values">
</div>
</section>
`;

processDisableValues(dynamicNavDisableValues, statusWidget.querySelector('.disable-values'), foundValues);
statusWidget.classList.add(status);

statusWidget.addEventListener('click', () => {
statusWidget.querySelector('.details').classList.toggle('hidden');
statusWidget.querySelector('.dns-badge').classList.toggle('dns-open');
});

return statusWidget;
};

export default async function main() {
const { dynamicNavKey } = getConfig();
const statusWidget = createStatusWidget(dynamicNavKey);
const topNav = document.querySelector('.feds-topnav');
const fedsWrapper = document.querySelector('.feds-nav-wrapper');
const dnsClose = statusWidget.querySelector('.dns-close');

dnsClose.addEventListener('click', () => {
topNav.removeChild(statusWidget);
});

fedsWrapper.after(statusWidget);
}
6 changes: 6 additions & 0 deletions libs/utils/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -1126,6 +1126,12 @@ export async function loadDeferred(area, blocks, config) {
import('../features/personalization/preview.js')
.then(({ default: decoratePreviewMode }) => decoratePreviewMode());
}
if (config?.dynamicNavKey && config?.env?.name !== 'prod') {
const { miloLibs } = config;
loadStyle(`${miloLibs}/features/dynamic-navigation/status.css`);
const { default: loadDNStatus } = await import('../features/dynamic-navigation/status.js');
JasonHowellSlavin marked this conversation as resolved.
Show resolved Hide resolved
loadDNStatus();
}
}

function initSidekick() {
Expand Down
2 changes: 1 addition & 1 deletion test/features/dynamic-nav/dynamicNav.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { readFile } from '@web/test-runner-commands';
import { expect } from '@esm-bundle/chai';
import { setConfig } from '../../../libs/utils/utils.js';
import dynamicNav from '../../../libs/features/dynamic-navigation.js';
import dynamicNav from '../../../libs/features/dynamic-navigation/dynamic-navigation.js';

describe('Dynamic nav', () => {
beforeEach(() => {
Expand Down
9 changes: 9 additions & 0 deletions test/features/dynamic-nav/mocks/status.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<header>
<nav class="feds-topnav" aria-label="Main">
<div class="feds-brand-container">
</div>
<div class="feds-nav-wrapper" id="feds-nav-wrapper">
<div class="feds-nav"></div>
</div>
</nav>
</header>
Loading
Loading