Skip to content
Snippets Groups Projects
Commit ac2ba7dd authored by Rhys Arkins's avatar Rhys Arkins
Browse files

refactor: displayFrom/displayTo

parent d398b7e7
No related branches found
No related tags found
No related merge requests found
...@@ -138,8 +138,6 @@ export interface LookupUpdate { ...@@ -138,8 +138,6 @@ export interface LookupUpdate {
blockedByPin?: boolean; blockedByPin?: boolean;
branchName?: string; branchName?: string;
commitMessageAction?: string; commitMessageAction?: string;
displayFrom?: string;
displayTo?: string;
isBump?: boolean; isBump?: boolean;
isLockfileUpdate?: boolean; isLockfileUpdate?: boolean;
isPin?: boolean; isPin?: boolean;
...@@ -163,8 +161,6 @@ export interface PackageDependency<T = Record<string, any>> extends Package<T> { ...@@ -163,8 +161,6 @@ export interface PackageDependency<T = Record<string, any>> extends Package<T> {
datasource?: string; datasource?: string;
deprecationMessage?: string; deprecationMessage?: string;
digestOneAndOnly?: boolean; digestOneAndOnly?: boolean;
displayFrom?: string;
displayTo?: string;
fixedVersion?: string; fixedVersion?: string;
currentVersion?: string; currentVersion?: string;
lockedVersion?: string; lockedVersion?: string;
......
...@@ -1502,8 +1502,6 @@ exports[`workers/repository/process/lookup/index .lookupUpdates() supports lock ...@@ -1502,8 +1502,6 @@ exports[`workers/repository/process/lookup/index .lookupUpdates() supports lock
Array [ Array [
Object { Object {
"bucket": "patch", "bucket": "patch",
"displayFrom": "0.4.0",
"displayTo": "0.4.4",
"isLockfileUpdate": true, "isLockfileUpdate": true,
"isRange": true, "isRange": true,
"newMajor": 0, "newMajor": 0,
......
...@@ -241,8 +241,6 @@ export async function lookupUpdates( ...@@ -241,8 +241,6 @@ export async function lookupUpdates(
continue; // eslint-disable-line no-continue continue; // eslint-disable-line no-continue
} }
res.isSingleVersion = true; res.isSingleVersion = true;
update.displayFrom = lockedVersion;
update.displayTo = newVersion;
} }
update.newMajor = versioning.getMajor(newVersion); update.newMajor = versioning.getMajor(newVersion);
update.newMinor = versioning.getMinor(newVersion); update.newMinor = versioning.getMinor(newVersion);
......
...@@ -51,8 +51,6 @@ describe(getName(__filename), () => { ...@@ -51,8 +51,6 @@ describe(getName(__filename), () => {
lockedVersion: '1.0.0', lockedVersion: '1.0.0',
newValue: '^1.0.0', newValue: '^1.0.0',
newVersion: '1.0.1', newVersion: '1.0.1',
displayFrom: '1.0.0',
displayTo: '1.0.1',
}, },
]; ];
const res = generateBranchConfig(branch); const res = generateBranchConfig(branch);
......
...@@ -41,14 +41,10 @@ function getTableValues( ...@@ -41,14 +41,10 @@ function getTableValues(
depName, depName,
currentVersion, currentVersion,
newVersion, newVersion,
displayFrom,
displayTo,
} = upgrade; } = upgrade;
const name = lookupName || depName; const name = lookupName || depName;
const from = currentVersion || displayFrom; if (datasource && name && currentVersion && newVersion) {
const to = newVersion || displayTo; return [datasource, name, currentVersion, newVersion];
if (datasource && name && from && to) {
return [datasource, name, from, to];
} }
logger.debug( logger.debug(
{ {
...@@ -57,8 +53,6 @@ function getTableValues( ...@@ -57,8 +53,6 @@ function getTableValues(
depName, depName,
currentVersion, currentVersion,
newVersion, newVersion,
displayFrom,
displayTo,
}, },
'Cannot determine table values' 'Cannot determine table values'
); );
...@@ -118,33 +112,18 @@ export function generateBranchConfig( ...@@ -118,33 +112,18 @@ export function generateBranchConfig(
upgrade.newDigestShort || upgrade.newDigestShort ||
upgrade.newDigest.replace('sha256:', '').substring(0, 7); upgrade.newDigest.replace('sha256:', '').substring(0, 7);
} }
// istanbul ignore next if (upgrade.isDigest) {
if (!upgrade.displayFrom) { upgrade.displayFrom = upgrade.currentDigestShort;
if (upgrade.currentValue === upgrade.newValue) { upgrade.displayTo = upgrade.newDigestShort;
upgrade.displayFrom = upgrade.currentDigestShort || ''; } else if (upgrade.isLockfileUpdate) {
upgrade.displayTo = upgrade.displayFrom = upgrade.currentVersion;
upgrade.displayTo || upgrade.displayTo = upgrade.newVersion;
upgrade.newDigestShort || } else if (!upgrade.isLockFileMaintenance) {
upgrade.newVersion || upgrade.displayFrom = upgrade.currentValue;
''; upgrade.displayTo = upgrade.newValue;
} else { }
upgrade.displayFrom = upgrade.displayFrom ??= '';
upgrade.currentValue || upgrade.currentDigestShort || ''; upgrade.displayTo ??= '';
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');
}
upgrade.prettyDepType = upgrade.prettyDepType =
upgrade.prettyDepType || upgrade.depType || 'dependency'; upgrade.prettyDepType || upgrade.depType || 'dependency';
if (useGroupSettings) { if (useGroupSettings) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment