diff --git a/lib/manager/types.ts b/lib/manager/types.ts index 6fc9da7b235fab..d28e977414d21a 100644 --- a/lib/manager/types.ts +++ b/lib/manager/types.ts @@ -138,8 +138,6 @@ export interface LookupUpdate { blockedByPin?: boolean; branchName?: string; commitMessageAction?: string; - displayFrom?: string; - displayTo?: string; isBump?: boolean; isLockfileUpdate?: boolean; isPin?: boolean; @@ -163,8 +161,6 @@ export interface PackageDependency> extends Package { datasource?: string; deprecationMessage?: string; digestOneAndOnly?: boolean; - displayFrom?: string; - displayTo?: string; fixedVersion?: string; currentVersion?: string; lockedVersion?: string; diff --git a/lib/workers/repository/process/lookup/__snapshots__/index.spec.ts.snap b/lib/workers/repository/process/lookup/__snapshots__/index.spec.ts.snap index 2071381105447e..1c87048435d640 100644 --- a/lib/workers/repository/process/lookup/__snapshots__/index.spec.ts.snap +++ b/lib/workers/repository/process/lookup/__snapshots__/index.spec.ts.snap @@ -1502,8 +1502,6 @@ exports[`workers/repository/process/lookup/index .lookupUpdates() supports lock Array [ Object { "bucket": "patch", - "displayFrom": "0.4.0", - "displayTo": "0.4.4", "isLockfileUpdate": true, "isRange": true, "newMajor": 0, diff --git a/lib/workers/repository/process/lookup/index.ts b/lib/workers/repository/process/lookup/index.ts index 7b566b03ea7cdb..d513e9741f7a34 100644 --- a/lib/workers/repository/process/lookup/index.ts +++ b/lib/workers/repository/process/lookup/index.ts @@ -241,8 +241,6 @@ export async function lookupUpdates( continue; // eslint-disable-line no-continue } res.isSingleVersion = true; - update.displayFrom = lockedVersion; - update.displayTo = newVersion; } update.newMajor = versioning.getMajor(newVersion); update.newMinor = versioning.getMinor(newVersion); diff --git a/lib/workers/repository/updates/generate.spec.ts b/lib/workers/repository/updates/generate.spec.ts index 346fbd9d727b92..01aa40b2ef5103 100644 --- a/lib/workers/repository/updates/generate.spec.ts +++ b/lib/workers/repository/updates/generate.spec.ts @@ -51,8 +51,6 @@ describe(getName(__filename), () => { lockedVersion: '1.0.0', newValue: '^1.0.0', newVersion: '1.0.1', - displayFrom: '1.0.0', - displayTo: '1.0.1', }, ]; const res = generateBranchConfig(branch); diff --git a/lib/workers/repository/updates/generate.ts b/lib/workers/repository/updates/generate.ts index fb4ef3cd6bc577..a7f18d194d20b3 100644 --- a/lib/workers/repository/updates/generate.ts +++ b/lib/workers/repository/updates/generate.ts @@ -41,14 +41,10 @@ function getTableValues( depName, currentVersion, newVersion, - displayFrom, - displayTo, } = upgrade; const name = lookupName || depName; - const from = currentVersion || displayFrom; - const to = newVersion || displayTo; - if (datasource && name && from && to) { - return [datasource, name, from, to]; + if (datasource && name && currentVersion && newVersion) { + return [datasource, name, currentVersion, newVersion]; } logger.debug( { @@ -57,8 +53,6 @@ function getTableValues( depName, currentVersion, newVersion, - displayFrom, - displayTo, }, 'Cannot determine table values' ); @@ -118,33 +112,18 @@ export function generateBranchConfig( upgrade.newDigestShort || upgrade.newDigest.replace('sha256:', '').substring(0, 7); } - // istanbul ignore next - if (!upgrade.displayFrom) { - if (upgrade.currentValue === upgrade.newValue) { - upgrade.displayFrom = upgrade.currentDigestShort || ''; - upgrade.displayTo = - upgrade.displayTo || - upgrade.newDigestShort || - upgrade.newVersion || - ''; - } else { - upgrade.displayFrom = - upgrade.currentValue || upgrade.currentDigestShort || ''; - upgrade.displayTo = - upgrade.displayTo || - upgrade.newValue || - upgrade.newVersion || - upgrade.newDigestShort || - ''; - } - } - - if ( - upgrade.updateType !== 'lockFileMaintenance' && - upgrade.displayFrom.length * upgrade.displayTo.length === 0 - ) { - logger.debug({ config: upgrade }, 'empty displayFrom/displayTo'); + if (upgrade.isDigest) { + upgrade.displayFrom = upgrade.currentDigestShort; + upgrade.displayTo = upgrade.newDigestShort; + } else if (upgrade.isLockfileUpdate) { + upgrade.displayFrom = upgrade.currentVersion; + upgrade.displayTo = upgrade.newVersion; + } else if (!upgrade.isLockFileMaintenance) { + upgrade.displayFrom = upgrade.currentValue; + upgrade.displayTo = upgrade.newValue; } + upgrade.displayFrom ??= ''; + upgrade.displayTo ??= ''; upgrade.prettyDepType = upgrade.prettyDepType || upgrade.depType || 'dependency'; if (useGroupSettings) {