@@ -222,7 +223,8 @@ export default async function decorate(block) {
});
}
- if (!isPublicPage()) {
+ if (await getUserProfile() !== null) {
+ document.querySelector('.adp-logo').href = getBaseConfigPath() + '/assets';
loadSearchField(nav);
if (!window.unifiedShellRuntime) {
await createUserInfo(nav);
@@ -355,7 +357,7 @@ async function initQuickLinks() {
}
//set aria-selected on quick links
quickLinks.querySelectorAll('.item').forEach((item) => {
- if (item.querySelector('a')?.dataset.page === window.location.pathname) {
+ if (item.querySelector('a')?.getAttribute('href') === window.location.pathname) {
item.setAttribute('aria-selected', 'true');
}
});
diff --git a/blocks/adp-infinite-results-collection/CollectionDatasource.js b/blocks/adp-infinite-results-collection/CollectionDatasource.js
index fc9300e6..7e03ece0 100644
--- a/blocks/adp-infinite-results-collection/CollectionDatasource.js
+++ b/blocks/adp-infinite-results-collection/CollectionDatasource.js
@@ -88,6 +88,8 @@ export default class CollectionsDatasource {
},
removeItemFromMultiSelectionHandler: () => {
infiniteResultsContainer.removeItemFromMultiSelection(assetId);
+ //Uncheck select all checkbox
+ document.getElementById('select-all-checkbox').checked = false;
},
},
);
diff --git a/blocks/adp-infinite-results-collection/adp-infinite-results-collection.js b/blocks/adp-infinite-results-collection/adp-infinite-results-collection.js
index 396a9472..aa9fe7da 100644
--- a/blocks/adp-infinite-results-collection/adp-infinite-results-collection.js
+++ b/blocks/adp-infinite-results-collection/adp-infinite-results-collection.js
@@ -16,6 +16,8 @@ export default async function decorate(block) {
infiniteResultsContainer.deselectItem(e.detail.assetId);
});
addEventListener(EventNames.CLOSE_BANNER, () => {
+ //Uncheck select all checkbox
+ document.getElementById('select-all-checkbox').checked = false;
infiniteResultsContainer.clearAllSelections();
});
}
@@ -39,3 +41,12 @@ export function hasNextCard() {
export function hasPreviousCard() {
return infiniteResultsContainer.hasPreviousCard();
}
+
+
+export function selectAllAssets() {
+ infiniteResultsContainer.selectAllItems();
+}
+
+export function deselectAllAssets() {
+ infiniteResultsContainer.deselectAllItems();
+}
diff --git a/blocks/adp-infinite-results-linkshare/LinkShareDatasource.js b/blocks/adp-infinite-results-linkshare/LinkShareDatasource.js
index bbd16608..1d6b21c0 100644
--- a/blocks/adp-infinite-results-linkshare/LinkShareDatasource.js
+++ b/blocks/adp-infinite-results-linkshare/LinkShareDatasource.js
@@ -53,6 +53,8 @@ export default class LinkShareDatasource {
},
removeItemFromMultiSelectionHandler: () => {
infiniteResultsContainer.removeItemFromMultiSelection(assetId);
+ //Uncheck select all checkbox
+ document.getElementById('select-all-checkbox').checked = false;
},
},
);
diff --git a/blocks/adp-infinite-results-linkshare/adp-infinite-results-linkshare.js b/blocks/adp-infinite-results-linkshare/adp-infinite-results-linkshare.js
index 19aabd04..a54be492 100644
--- a/blocks/adp-infinite-results-linkshare/adp-infinite-results-linkshare.js
+++ b/blocks/adp-infinite-results-linkshare/adp-infinite-results-linkshare.js
@@ -8,10 +8,13 @@ export default async function decorate(block) {
const instantSearchDatasource = new LinkShareDatasource();
infiniteResultsContainer = new InfiniteResultsContainer(block, instantSearchDatasource);
infiniteResultsContainer.render();
+
addEventListener(EventNames.ASSET_QUICK_PREVIEW_CLOSE, (e) => {
infiniteResultsContainer.deselectItem(e.detail.assetId);
});
addEventListener(EventNames.CLOSE_BANNER, () => {
+ //Uncheck select all checkbox
+ document.getElementById('select-all-checkbox').checked = false;
infiniteResultsContainer.clearAllSelections();
});
}
@@ -21,3 +24,11 @@ export function openLinkShare(id) {
// change the url
window.history.pushState({}, '', url);
}
+
+export function selectAllAssets() {
+ infiniteResultsContainer.selectAllItems();
+}
+
+export function deselectAllAssets() {
+ infiniteResultsContainer.deselectAllItems();
+}
diff --git a/blocks/adp-search-field/adp-search-field.js b/blocks/adp-search-field/adp-search-field.js
index d68eec56..b522ccd9 100644
--- a/blocks/adp-search-field/adp-search-field.js
+++ b/blocks/adp-search-field/adp-search-field.js
@@ -86,7 +86,7 @@ function createSuggestionsPlugin(recentSearchesPlugin) {
if (enableSearchSuggestions) {
querySuggestionsPlugin = createQuerySuggestionsPlugin({
searchClient: getSearchClient(),
- indexName: 'query_suggestions',
+ indexName: INSTANT_SEARCH_INDEX_NAME + '_query_suggestions',
getSearchParams({ state }) {
// This creates a shared `hitsPerPage` value once the duplicates
// between recent searches and Query Suggestions are removed.
diff --git a/blocks/adp-share-header/adp-share-header.css b/blocks/adp-share-header/adp-share-header.css
new file mode 100644
index 00000000..f4656feb
--- /dev/null
+++ b/blocks/adp-share-header/adp-share-header.css
@@ -0,0 +1,55 @@
+
+.adp-share-header {
+ display: flex;
+ height: 62px;
+}
+
+.adp-share-header-left {
+ display: flex;
+ gap: 15px;
+ align-items: center;
+ width: 100%;
+ font-size: var(--header-font-size);
+ padding: 0;
+ top: 0.01rem;
+ padding-top: 0.88rem;
+ padding-bottom: 0.88rem;
+ z-index: 1;
+}
+
+.adp-share-subinfo {
+ display: flex;
+ /* justify-content: space-between; /* Aligns items to the left and select all to the right */
+ align-items: center; /* Centers items vertically */
+}
+
+.adp-share-select-all {
+ display: flex;
+ align-items: center; /* This will vertically align the checkbox and label */
+}
+
+.adp-share-select-all input[type="checkbox"] {
+ margin-right: 5px; /* Adds some space between the checkbox and the label */
+}
+
+.adp-share-header-share-info {
+ display: flex;
+ flex-direction: column; /* Stack the title and sub-info vertically */
+}
+
+.adp-share-header {
+ font: var(--collection-heading-font);
+ width: 100%;
+}
+
+.adp-share-header .actions .adp-action {
+ text-wrap: nowrap;
+ align-items: center;
+}
+
+.adp-share-header .actions {
+ /* vertically align center */
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
diff --git a/blocks/adp-share-header/adp-share-header.js b/blocks/adp-share-header/adp-share-header.js
new file mode 100644
index 00000000..ab300dc7
--- /dev/null
+++ b/blocks/adp-share-header/adp-share-header.js
@@ -0,0 +1,34 @@
+import { decorateIcons } from '../../scripts/lib-franklin.js';
+import { createLinkHref, navigateTo } from '../../scripts/scripts.js';
+
+import {
+ selectAllAssets, deselectAllAssets
+} from '../adp-infinite-results-linkshare/adp-infinite-results-linkshare.js';
+
+function createShareInfoHeader(shareInfoHeader) {
+
+ shareInfoHeader.innerHTML = `
+
+ `;
+
+ document.getElementById('select-all-checkbox').addEventListener('click', (event) => {
+ event.target.checked ? selectAllAssets() : deselectAllAssets();
+ });
+
+ decorateIcons(shareInfoHeader);
+ return shareInfoHeader;
+}
+
+export default async function decorate(block) {
+ block.innerHTML = '';
+ createShareInfoHeader(block);
+}
diff --git a/blocks/gmo-landing-page/gmo-landing-page.css b/blocks/gmo-landing-page/gmo-landing-page.css
index aeb78abf..27374f22 100644
--- a/blocks/gmo-landing-page/gmo-landing-page.css
+++ b/blocks/gmo-landing-page/gmo-landing-page.css
@@ -8,12 +8,27 @@
color: #505050;
}
+.gmo-landing-page p a:any-link {
+ color: #035fe6;
+ transition:
+ color 0.2s;
+}
+
+.gmo-landing-page p a:hover {
+ color: #136ff6;
+}
+
+.gmo-landing-page p a:active {
+ color: #035fe6;
+}
+
.gmo-landing-page .video-background {
position: relative;
width: 100%;
display: flex;
justify-content: center;
}
+
.gmo-landing-page .video-background video {
position: relative;
top: 0;
diff --git a/blocks/gmo-landing-page/gmo-landing-page.js b/blocks/gmo-landing-page/gmo-landing-page.js
index af6187fd..b6da5a47 100644
--- a/blocks/gmo-landing-page/gmo-landing-page.js
+++ b/blocks/gmo-landing-page/gmo-landing-page.js
@@ -1,5 +1,45 @@
import { readBlockConfig } from '../../scripts/lib-franklin.js';
+async function waitForVideoLoad() {
+ const video = document.querySelector('.desktop');
+ return new Promise((resolve) => {
+ video.oncanplaythrough = () => {
+ resolve();
+ };
+ });
+}
+
+async function getVideoColor(){
+ const video = document.querySelector('.desktop');
+ const canvas = document.createElement('canvas');
+ const context = canvas.getContext('2d', { willReadFrequently: true });
+ await waitForVideoLoad();
+
+ canvas.width = video.videoWidth;
+ canvas.height = video.videoHeight;
+
+ let hexColorOld = null;
+
+ // Capture the video frame and extract the color information at the specified interval
+ setInterval(() => {
+ context.drawImage(video, 0, 0, canvas.width, canvas.height);
+ const pixelData = context.getImageData(10, 10, canvas.width, canvas.height).data;
+ const red = pixelData[0];
+ const green = pixelData[1];
+ const blue = pixelData[2];
+ const hexColor = '#' + ((1 << 24) + (red << 16) + (green << 8) + blue).toString(16).slice(1);
+
+ if (hexColorOld !== hexColor) {
+ hexColorOld = hexColor;
+ let linkActive = document.querySelector('.gmo-landing-page p a');
+ if (hexColor == '#000000') {
+ return linkActive.style.color = '#72B7F9';
+ }
+ linkActive.style.color = '#035FE6';
+ }
+ }, 500);
+}
+
export default async function decorate(block) {
const host = location.origin;
const signInMsg = getSignInMsg(block);
@@ -8,10 +48,11 @@ export default async function decorate(block) {
block.innerHTML=`
-
@@ -32,6 +73,7 @@ export default async function decorate(block) {
`
const msgParent = block.querySelector(".signin-notif");
msgParent.append(signInMsg);
+ getVideoColor();
}
function getSignInMsg(block) {
@@ -42,4 +84,5 @@ function getSignInMsg(block) {
}
});
return msgDiv;
-}
\ No newline at end of file
+}
+
diff --git a/blocks/gmo-metrics/gmo-metrics.css b/blocks/gmo-metrics/gmo-metrics.css
index c5b7317b..17067ffe 100644
--- a/blocks/gmo-metrics/gmo-metrics.css
+++ b/blocks/gmo-metrics/gmo-metrics.css
@@ -12,6 +12,17 @@
content: '';
}
+.gmo-metrics .title {
+ display: flex;
+ justify-content: space-between;
+}
+
+.gmo-metrics .subtitle-right {
+ font-size: 16px;
+ color: var(--assets-browser-text-color);
+ font-weight: normal;
+}
+
.gmo-metrics .graph-container {
display: flex;
flex-flow: row wrap;
@@ -100,4 +111,5 @@
align-items: center;
justify-content: center;
}
+
}
diff --git a/blocks/gmo-metrics/gmo-metrics.js b/blocks/gmo-metrics/gmo-metrics.js
index c35504ac..7d208f39 100644
--- a/blocks/gmo-metrics/gmo-metrics.js
+++ b/blocks/gmo-metrics/gmo-metrics.js
@@ -6,20 +6,20 @@ import { logError } from '../../scripts/scripts.js';
const GENERAL_METRICS = [{
category: 'Total assets',
- amount: 59475,
+ amount: 60882,
}, {
category: 'Total size',
- amount: 1024 * 1024 * 1024 * 331.6,
+ amount: 1024 * 1024 * 1024 * 334,
unit: 'bytes',
}, {
category: 'Uploads year-to-date',
- amount: 59475,
+ amount: 261,
}, {
category: 'Uploads quarter-to-date',
- amount: 56629,
+ amount: 57865,
}, {
category: 'Uploads last 30 days',
- amount: 56486,
+ amount: 261,
}];
function formatNumber(number) {
@@ -57,40 +57,42 @@ function formatAmount(metric) {
}
const MIME_TYPES = [
- { category: 'video/mp4', amount: 3579 },
- { category: 'image/jpeg', amount: 51258 },
- { category: 'image/png', amount: 2102 },
- { category: 'video/quicktime', amount: 422 },
- { category: 'image/vnd.adobe.photoshop', amount: 380 },
- { category: 'audio/x-wav', amount: 104 },
- { category: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', amount: 102 },
- { category: 'application/vnd.adobe.sparkler.project+dcx', amount: 578 },
- { category: 'application/pdf', amount: 571 },
- { category: 'application/octet-stream', amount: 48 },
- { category: 'application/postscript', amount: 33 },
- { category: 'application/json', amount: 30 },
+ { category: 'image/jpeg', amount: 51595 },
+ { category: 'video/mp4', amount: 3794 },
+ { category: 'image/png', amount: 2404 },
+ { category: 'application/vnd.adobe.sparkler.project+dcx', amount: 632 },
+ { category: 'application/pdf', amount: 631 },
+ { category: 'video/quicktime', amount: 598 },
+ { category: 'image/vnd.adobe.photoshop', amount: 402 },
+ { category: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', amount: 170 },
+ { category: 'audio/x-wav', amount: 166 },
+ { category: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', amount: 137 },
+ { category: 'application/octet-stream', amount: 56 },
+ { category: 'image/tiff', amount: 50 },
+ { category: 'application/postscript', amount: 48 },
+ { category: 'image/svg+xml', amount: 35 },
+ { category: 'application/x-subrip', amount: 30 },
+ { category: 'application/zip', amount: 30 },
+ { category: 'application/x-font-otf', amount: 22 },
{ category: 'application/vnd.audiograph', amount: 19 },
- { category: 'application/x-subrip', amount: 18 },
{ category: 'application/vnd.openxmlformats-officedocument.presentationml.presentation', amount: 15 },
- { category: 'application/zip', amount: 21 },
- { category: 'image/svg+xml', amount: 9 },
+ { category: 'application/vnd.3gpp.pic-bw-small', amount: 11 },
{ category: 'image/gif', amount: 11 },
- { category: 'application/vnd.3gpp.pic-bw-small', amount: 9 },
{ category: 'video/ogg', amount: 9 },
- { category: 'image/tiff', amount: 8 },
- { category: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', amount: 170 },
{ category: 'audio/mpeg', amount: 4 },
+ { category: 'image/dng', amount: 3 },
{ category: 'text/html', amount: 3 },
{ category: 'text/plain', amount: 2 },
+ { category: 'application/x-indesign', amount: 1 },
];
-const BUSINESS_UNITS = [{
+/*const BUSINESS_UNITS = [{
category: 'Digital Media',
amount: 2517,
}, {
category: 'Other',
amount: 509,
-}];
+}];*/
const PRODUCTS = [{
category: 'Photoshop',
@@ -323,7 +325,10 @@ function sortByAmount(values) {
export default async function decorate(block) {
const config = readBlockConfig(block);
block.innerHTML = `
-
${config.title || 'Asset Metrics'}
+
+
${config.title || 'Asset Metrics'}
+ Updated: ${config.updated}
+
Asset Statistics
diff --git a/blocks/gmo-teaser/gmo-teaser.css b/blocks/gmo-teaser/gmo-teaser.css
index 8fed5986..6f7639d9 100644
--- a/blocks/gmo-teaser/gmo-teaser.css
+++ b/blocks/gmo-teaser/gmo-teaser.css
@@ -9,6 +9,18 @@
text-transform: none;
}
+.gmo-teaser a:any-link {
+ color: #72B7F9;
+}
+
+.gmo-teaser a:hover {
+ color: #8FCAFC;
+}
+
+.gmo-teaser a:active {
+ color: #AEDBFE;
+}
+
.gmo-teaser .teaser {
background-color: #292929;
color: #efefef;
diff --git a/scripts/custom-scripts.js b/scripts/custom-scripts.js
index 656b9009..f67f21cd 100644
--- a/scripts/custom-scripts.js
+++ b/scripts/custom-scripts.js
@@ -5,17 +5,18 @@ import showToast from "./toast-message.js";
initLegalNotice();
async function initLegalNotice() {
- const config = await getBrandingConfig();
+ const config = await getBrandingConfig();
+ if (config?.legalMessage) {
document.addEventListener(EventNames.SESSION_STARTED, function() {
showLegalNotice(config);
});
+ }
}
function showLegalNotice(config) {
- const legalDefault = `NOTICE: Adobe records and uses your e-mail address for tracking purposes.`;
- const legalToast = config?.legalMessage || legalDefault;
- const legalDuration = 10000;
- const toastType = "info";
+ const legalToast = config?.legalMessage;
+ const legalDuration = 10000;
+ const toastType = "info";
- showToast(legalToast, legalDuration, toastType, false);
+ showToast(legalToast, legalDuration, toastType, false);
}
\ No newline at end of file
diff --git a/scripts/metadata.js b/scripts/metadata.js
index fed287eb..f9368c5a 100644
--- a/scripts/metadata.js
+++ b/scripts/metadata.js
@@ -180,6 +180,14 @@ export function getAssetSize(assetJSON) {
return getMetadataValue('size', assetJSON);
}
+/**
+ * Is licensed content
+ * Returns true for gmo:licensedContent != 'no'
+ */
+export function isLicensedContent(assetJSON) {
+ return getMetadataValue('gmo:licensedContent', assetJSON) !== 'no';
+}
+
/**
* Predefined metadata fields that have special handling, can have compound values and a
* special formatter.
diff --git a/scripts/security-imslib.js b/scripts/security-imslib.js
index 9d179dd6..a349d974 100644
--- a/scripts/security-imslib.js
+++ b/scripts/security-imslib.js
@@ -1,6 +1,7 @@
import { loadScript } from './lib-franklin.js';
import { getAdminConfig } from './site-config.js';
import { fetchCached } from './fetch-util.js';
+import { isPublicPage } from './security.js';
let isIMSInitialized = false;
@@ -25,7 +26,7 @@ async function getBearerTokenFromIMS(callWithToken) {
}
if (!isIMSInitialized) {
window.adobeid = {
- client_id: IMSLIB_ENV_CONFIG.clientId,
+ client_id: imsLibConfig.clientId,
scope: IMSLIB_ENV_CONFIG.scope,
locale: 'en_US',
autoValidateToken: true,
@@ -39,8 +40,10 @@ async function getBearerTokenFromIMS(callWithToken) {
}
const token = tokenDetails && tokenDetails.token;
callWithToken(token);
- } else {
- window.adobeIMS.reAuthenticate();
+ return;
+ }
+ if (!isPublicPage()) {
+ window.adobeIMS.reAuthenticate();
}
},
};
@@ -48,9 +51,9 @@ async function getBearerTokenFromIMS(callWithToken) {
// load ims.min.js
await loadScript(IMSLIB_ENV_CONFIG.urls[imsLibConfig.imsEnvironment]);
isIMSInitialized = true;
- } else {
- window.adobeIMS.reAuthenticate();
+ return;
}
+ window.adobeIMS.reAuthenticate();
}
/**
diff --git a/scripts/security.js b/scripts/security.js
index 8d44e13b..659a7c98 100644
--- a/scripts/security.js
+++ b/scripts/security.js
@@ -97,20 +97,15 @@ export function isPublicPage() {
}
export async function checkUserAccess() {
- if (isPublicPage()) {
- return true;
- }
- if (isUnifiedShellRuntimeAvailable()) {
- return !!user.get('imsProfile');
- } else {
- await getBearerToken();
- const { imsUserGroup } = await getIMSConfig();
- if (imsUserGroup) {
- const imsLibSecurityModule = await import('./security-imslib.js');
- return await imsLibSecurityModule.isUserInSecurityGroup(imsUserGroup, await getBearerToken());
- } else {
+ if (isUnifiedShellRuntimeAvailable()) return !!user.get('imsProfile');
+ await getBearerToken();
+ const { imsUserGroup } = await getIMSConfig();
+ if (imsUserGroup) {
+ const imsLibSecurityModule = await import('./security-imslib.js');
+ if (isPublicPage()) {
return true;
- }
+ }
+ return await imsLibSecurityModule.isUserInSecurityGroup(imsUserGroup, await getBearerToken());
}
}
diff --git a/styles/gmo-styles.css b/styles/gmo-styles.css
index 44fe5826..e7b2b014 100644
--- a/styles/gmo-styles.css
+++ b/styles/gmo-styles.css
@@ -28,5 +28,4 @@ header nav .nav-brand .adp-logo img {
.adp-toast {
text-transform: none;
-}
-
+}
\ No newline at end of file