diff --git a/dist_scripts/scripts/generateJson/radar.js b/dist_scripts/scripts/generateJson/radar.js index 7611525..0a59e0a 100644 --- a/dist_scripts/scripts/generateJson/radar.js +++ b/dist_scripts/scripts/generateJson/radar.js @@ -167,10 +167,7 @@ var createItems = function (revisions) { return __assign(__assign({}, items), (_a = {}, _a[revision.name] = addRevisionToItem(items[revision.name], revision), _a)); }, {}); return Object.values(itemMap) - .map(function (item) { - var _a; - return (__assign(__assign({}, item), (_a = {}, _a["title"] = item.title || item.name, _a))); - }) + .map(function (item) { return (__assign(__assign({}, item), { "title": item.title || item.name })); }) .sort(function (x, y) { return (x.name > y.name ? 1 : -1); }); }; var ignoreEmptyRevisionBody = function (revision, item) { @@ -192,13 +189,13 @@ var addRevisionToItem = function (item, revision) { info: "", }; } var newItem = __assign(__assign(__assign({}, item), revision), { body: ignoreEmptyRevisionBody(revision, item) }); - if (revisionCreatesNewHistoryEntry(revision)) { + if (revisionCreatesNewHistoryEntry(revision, item)) { newItem = __assign(__assign({}, newItem), { revisions: __spreadArray([revision], newItem.revisions) }); } return newItem; }; -var revisionCreatesNewHistoryEntry = function (revision) { - return revision.body.trim() !== "" || typeof revision.ring !== "undefined"; +var revisionCreatesNewHistoryEntry = function (revision, item) { + return revision.body.trim() !== "" || (typeof revision.ring !== "undefined" && revision.ring !== item.ring) || (typeof revision.quadrant !== "undefined" && revision.quadrant !== item.quadrant); }; var flagItem = function (items, allReleases) { return items.map(function (item) { diff --git a/scripts/generateJson/radar.ts b/scripts/generateJson/radar.ts index 30b52cb..ae19643 100644 --- a/scripts/generateJson/radar.ts +++ b/scripts/generateJson/radar.ts @@ -142,7 +142,7 @@ const addRevisionToItem = ( body: ignoreEmptyRevisionBody(revision, item), }; - if (revisionCreatesNewHistoryEntry(revision)) { + if (revisionCreatesNewHistoryEntry(revision, item)) { newItem = { ...newItem, revisions: [revision, ...newItem.revisions], @@ -152,8 +152,8 @@ const addRevisionToItem = ( return newItem; }; -const revisionCreatesNewHistoryEntry = (revision: Revision) => { - return revision.body.trim() !== "" || typeof revision.ring !== "undefined"; +const revisionCreatesNewHistoryEntry = (revision: Revision, item: Item) => { + return revision.body.trim() !== "" || (typeof revision.ring !== "undefined" && revision.ring !== item.ring) || (typeof revision.quadrant !== "undefined" && revision.quadrant !== item.quadrant); }; const flagItem = (items: Item[], allReleases: string[]) =>