fix(revisions): double revisions on fade-out

This commit is contained in:
Bastian Ike
2022-04-26 09:39:38 +02:00
committed by Bastian
parent 91d802ab2c
commit 00dc431c96
2 changed files with 7 additions and 10 deletions

View File

@@ -167,10 +167,7 @@ var createItems = function (revisions) {
return __assign(__assign({}, items), (_a = {}, _a[revision.name] = addRevisionToItem(items[revision.name], revision), _a)); return __assign(__assign({}, items), (_a = {}, _a[revision.name] = addRevisionToItem(items[revision.name], revision), _a));
}, {}); }, {});
return Object.values(itemMap) return Object.values(itemMap)
.map(function (item) { .map(function (item) { return (__assign(__assign({}, item), { "title": item.title || item.name })); })
var _a;
return (__assign(__assign({}, item), (_a = {}, _a["title"] = item.title || item.name, _a)));
})
.sort(function (x, y) { return (x.name > y.name ? 1 : -1); }); .sort(function (x, y) { return (x.name > y.name ? 1 : -1); });
}; };
var ignoreEmptyRevisionBody = function (revision, item) { var ignoreEmptyRevisionBody = function (revision, item) {
@@ -192,13 +189,13 @@ var addRevisionToItem = function (item, revision) {
info: "", info: "",
}; } }; }
var newItem = __assign(__assign(__assign({}, item), revision), { body: ignoreEmptyRevisionBody(revision, item) }); 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) }); newItem = __assign(__assign({}, newItem), { revisions: __spreadArray([revision], newItem.revisions) });
} }
return newItem; return newItem;
}; };
var revisionCreatesNewHistoryEntry = function (revision) { var revisionCreatesNewHistoryEntry = function (revision, item) {
return revision.body.trim() !== "" || typeof revision.ring !== "undefined"; 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) { var flagItem = function (items, allReleases) {
return items.map(function (item) { return items.map(function (item) {

View File

@@ -142,7 +142,7 @@ const addRevisionToItem = (
body: ignoreEmptyRevisionBody(revision, item), body: ignoreEmptyRevisionBody(revision, item),
}; };
if (revisionCreatesNewHistoryEntry(revision)) { if (revisionCreatesNewHistoryEntry(revision, item)) {
newItem = { newItem = {
...newItem, ...newItem,
revisions: [revision, ...newItem.revisions], revisions: [revision, ...newItem.revisions],
@@ -152,8 +152,8 @@ const addRevisionToItem = (
return newItem; return newItem;
}; };
const revisionCreatesNewHistoryEntry = (revision: Revision) => { const revisionCreatesNewHistoryEntry = (revision: Revision, item: Item) => {
return revision.body.trim() !== "" || typeof revision.ring !== "undefined"; 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[]) => const flagItem = (items: Item[], allReleases: string[]) =>