Skip to content

Commit

Permalink
check for media in urls pathnames
Browse files Browse the repository at this point in the history
  • Loading branch information
Sartxi committed Jul 25, 2024
1 parent d23f7c3 commit aec3d01
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
4 changes: 2 additions & 2 deletions libs/blocks/locui/actions/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
import { setExcelStatus, setStatus } from '../utils/status.js';
import { origin, preview } from '../utils/franklin.js';
import { createTag, decorateSections, decorateFooterPromo } from '../../../utils/utils.js';
import { getUrls, validateUrlsOrigin } from '../loc/index.js';
import { getUrls, validateUrlsFormat } from '../loc/index.js';
import updateExcelTable from '../../../tools/sharepoint/excel.js';
import { getItemId } from '../../../tools/sharepoint/shared.js';
import {
Expand Down Expand Up @@ -146,7 +146,7 @@ export async function findFragments() {
}
return acc;
}, []);
return validateUrlsOrigin(foundFragments);
return validateUrlsFormat(foundFragments, true);
}

export async function syncToExcel(paths) {
Expand Down
10 changes: 8 additions & 2 deletions libs/blocks/locui/loc/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ async function validateUrl(url) {
}
}

export function validateUrlsOrigin(projectUrls) {
export function validateUrlsFormat(projectUrls, removeMedia = false) {
projectUrls.forEach((projectUrl) => {
const url = Array.isArray(projectUrl) ? projectUrl[0] : projectUrl;
let urlOrigin = url.origin;
Expand All @@ -49,7 +49,13 @@ export function validateUrlsOrigin(projectUrls) {
if (urlOrigin !== origin) {
url.valid = 'not same domain';
}
if ((/\.(gif|jpg|jpeg|tiff|png|webp)$/i).test(url.pathname)) {
url.valid = 'media';
}
});
if (removeMedia) {
return projectUrls.filter((url) => url.valid === 'media');
}
return projectUrls;
}

Expand All @@ -67,7 +73,7 @@ async function validatedUrls(projectUrls) {
setStatus('details', 'error', 'There was an error validating project URLs.', error);
}
}
return validateUrlsOrigin(projectUrls);
return validateUrlsFormat(projectUrls);
}

export function getUrls(jsonUrls) {
Expand Down

0 comments on commit aec3d01

Please sign in to comment.