From d834281340a72c6b07d51770d59921d09877a8f0 Mon Sep 17 00:00:00 2001
From: RahulGautamSingh <rahultesnik@gmail.com>
Date: Fri, 2 Feb 2024 00:50:36 +0545
Subject: [PATCH] fix(update/pr): improve de-duplication of table rows (#26993)
---
lib/workers/repository/update/pr/body/updates-table.spec.ts | 4 ++++
lib/workers/repository/update/pr/body/updates-table.ts | 6 +-----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/workers/repository/update/pr/body/updates-table.spec.ts b/lib/workers/repository/update/pr/body/updates-table.spec.ts
index 40eec486fd..4fd2d140f7 100644
--- a/lib/workers/repository/update/pr/body/updates-table.spec.ts
+++ b/lib/workers/repository/update/pr/body/updates-table.spec.ts
@@ -171,6 +171,8 @@ describe('workers/repository/update/pr/body/updates-table', () => {
depName: 'mocha',
currentValue: '^6.2.3',
newValue: '6.2.3',
+ currentVersion: '6.2.3',
+ newVersion: '6.2.3',
displayFrom: '^6.2.3',
displayTo: '6.2.3',
});
@@ -215,6 +217,8 @@ describe('workers/repository/update/pr/body/updates-table', () => {
depName: 'mocha',
currentValue: '^6.2.3',
newValue: '6.2.3',
+ currentVersion: '6.2.3',
+ newVersion: '6.2.3',
displayFrom: '^6.2.3',
displayTo: '6.2.3',
displayPending: 'some-string',
diff --git a/lib/workers/repository/update/pr/body/updates-table.ts b/lib/workers/repository/update/pr/body/updates-table.ts
index dc338ac0d6..c2af33d7b8 100644
--- a/lib/workers/repository/update/pr/body/updates-table.ts
+++ b/lib/workers/repository/update/pr/body/updates-table.ts
@@ -49,11 +49,7 @@ export function getPrUpdatesTable(config: BranchConfig): string {
for (const upgrade of config.upgrades) {
if (upgrade) {
// Create a key based on the properties which are significant in the updates table
- const key = `${upgrade.depName ?? ''}_${upgrade.depType ?? ''}_${
- upgrade.newValue ?? upgrade.newVersion ?? ''
- }_${upgrade.currentValue ?? upgrade.currentVersion ?? ''}_${
- upgrade.updateType
- }`;
+ const key = `${upgrade.depName ?? ''}_${upgrade.depType ?? ''}_${upgrade.newValue ?? ''}_${upgrade.newVersion ?? ''}_${upgrade.currentValue ?? ''}_${upgrade.currentVersion ?? ''}_${upgrade.updateType}`;
const res: Record<string, string> = {};
const rowDefinition = getRowDefinition(config.prBodyColumns, upgrade);
--
GitLab