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.

Sign up for GitHub

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

Allow fields to include labelled hyperlinks and be split into sections #851

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow fields to include labelled hyperlinks and be split into sections #851

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1228a2d
(dialog box): Add optional sections in detail view
milanlakhani Jul 19, 2022
530265a
(dialog box): Throw error if a key is not in sections
milanlakhani Jul 20, 2022
9eaf377
(dialog box): Make it possible to label hyperlinks
milanlakhani Oct 18, 2022
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
84 changes: 61 additions & 23 deletions src/components/ItemDialogContentRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,34 +586,72 @@ module.exports.render = function({settings, tweetsCount, itemInfo}) {
return '';
})();

const extraElement = ( function() {
if (!itemInfo.extra) {
const renderExtraField = function (key) {
if (key.indexOf('summary_') === 0) {
return '';
}
const items = Object.keys(itemInfo.extra).map( function(key) {
if (key.indexOf('summary_') === 0) {
return '';
const value = itemInfo.extra[key];
const keyText = (function() {
const step1 = key.replace(/_url/g, '');
const step2 = step1.split('_').map( (x) => x.charAt(0).toUpperCase() + x.substring(1)).join(' ');
return step2;
})();
const valueText = (function() {
if (!!(new Date(value).getTime()) && typeof value === 'string') {
return h(relativeDate(new Date(value)));
}
const value = itemInfo.extra[key];
const keyText = (function() {
const step1 = key.replace(/_url/g, '');
const step2 = step1.split('_').map( (x) => x.charAt(0).toUpperCase() + x.substring(1)).join(' ');
return step2;
})();
const valueText = (function() {
if (!!(new Date(value).getTime()) && typeof value === 'string') {
return h(relativeDate(new Date(value)));
}
if (typeof value === 'string' && (value.indexOf('http://') === 0 || value.indexOf('https://') === 0)) {
if (typeof value === 'string') {
if (value.indexOf('http://') === 0 || value.indexOf('https://') === 0) {
return `<a data-type="external" target=_blank href="${h(value)}">${h(value)}</a>`;
}
return h(value);
})();
return `<div class="product-property row">
<div class="product-property-name tight-col col-20">${h(keyText)}</div>
<div class="product-proerty-value tight-col col-80">${valueText}</div>
</div>`;
});
const labelledLinks = value.match(/\<([\w\s\d]+)\>\(((http?:\/\/|https?:\/\/)[\w\d./?=#-~]+)\)/gmi);
if (labelledLinks) {
let valueWithLinks = value;
labelledLinks.forEach(link => {
const linkIndex = link.indexOf(">");
const htmlLink = `<a data-type="external" target=_blank href="${h(link.slice(linkIndex+2, link.length-1))}">${h(link.slice(1, linkIndex))}</a>`;
valueWithLinks = valueWithLinks.replace(link, htmlLink);
})
return valueWithLinks;
}
}
return h(value);
})();
return `<div class="product-property row">
<div class="product-property-name tight-col col-20">${h(keyText)}</div>
<div class="product-proerty-value tight-col col-80">${valueText}</div>
</div>`;
}

const extraElement = ( function() {
if (!itemInfo.extra) {
return '';
}
let items = [];
const sections = settings.big_picture.main.sections || false;
if (!(sections)) {
items = Object.keys(itemInfo.extra).filter(key=>itemInfo.extra[key]).map(renderExtraField);
} else {
Object.keys(itemInfo.extra).forEach( key => {
if (sections.every( section => {
return !(section.children.includes(key));
})) {
throw new Error(`Failed to find key "${key}" in any section of the sections object`);
}
});
items = sections.map( section => {
const section_heading = `<div class="product-property row">
<div class="product-property-name tight-col col-100" style="font-weight: bold;">${section.name}</div>
</div>`;
let rows = [section_heading];
section.children.forEach( key => {
if (itemInfo.extra[key]) {
rows.push(renderExtraField(key));
}
});
return rows.length === 1 ? '' : rows.join('');
});
}
return items.join('');
})();

Expand Down