From 748a005778549c573e333bc4cabc5b1ca5df4974 Mon Sep 17 00:00:00 2001 From: Tom Raithel Date: Thu, 26 Jan 2017 08:22:05 +0100 Subject: [PATCH] Only create history entries for revisions with text or ring changes --- static-pages/index.pug | 7 +++---- tasks/radar.js | 23 ++++++++++++++++++----- templates/item.pug | 7 +++++-- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/static-pages/index.pug b/static-pages/index.pug index 036d08d..441194b 100644 --- a/static-pages/index.pug +++ b/static-pages/index.pug @@ -10,7 +10,6 @@ block content h4= translate(quadrantName) ul each radarItem, itemName in quadrant - if radarItem.attributes.isFeatured === true - li - a(href='/' + quadrantName + '/' + itemName + '.html') - = radarItem.attributes.title + li + a(href='/' + quadrantName + '/' + itemName + '.html') + = radarItem.attributes.title diff --git a/tasks/radar.js b/tasks/radar.js index f4f5541..9ed833c 100644 --- a/tasks/radar.js +++ b/tasks/radar.js @@ -91,17 +91,30 @@ const addRevisionToItem = (item = { fileName, ...rest, } = revision; - return { + let newItem = { ...item, attributes: { ...item.attributes, ...revision.attributes, }, - revisions: [ - rest, - ...item.revisions, - ], }; + + if (revisionCreatesNewHistoryEntry(revision)) { + newItem = { + ...newItem, + revisions: [ + rest, + ...newItem.revisions, + ], + } + } + + return newItem; +}; + +const revisionCreatesNewHistoryEntry = (revision) => { + return revision.body.trim() !== '' || + typeof revision.attributes.ring !== 'undefined'; }; export const outputRadar = (radar) => { diff --git a/templates/item.pug b/templates/item.pug index 5c64cae..6d10eb0 100644 --- a/templates/item.pug +++ b/templates/item.pug @@ -11,7 +11,7 @@ block content hr - + h4= item.revisions[0].version h5 New: #{item.isNew ? 'YES' : 'NO'} h5 Feature: #{item.attributes.isFeatured ? 'YES' : 'NO'} @@ -24,5 +24,8 @@ block content each revision, index in item.revisions if index > 0 li - = revision.version + h3 + = revision.version + = ' ' + = revision.attributes.ring != revision.body