fix: remove manualStep count tracking

Author: Julusian

meteor/server/coreSystem/index.ts

@@ -84,7 +84,7 @@ async function initializeCoreSystem() {
 		if (!isRunningInJest()) {
 			// Check what migration has to provide:
 			const migration = await prepareMigration(true)
-			if (migration.migrationNeeded && migration.manualStepCount === 0 && migration.chunks.length <= 1) {
+			if (migration.migrationNeeded && migration.chunks.length <= 1) {
 				// Since we've determined that the migration can be done automatically, and we have a fresh system, just do the migration automatically:
 				await runMigration(migration.chunks, migration.hash)
 			}

meteor/server/migration/__tests__/migrations.test.ts

@@ -47,11 +47,8 @@ describe('Migrations', () => {
 			migrationNeeded: true,
 
 			migration: {
-				canDoAutomaticMigration: true,
-				// manualInputs: [],
 				hash: expect.stringContaining(''),
 				automaticStepCount: expect.any(Number),
-				manualStepCount: expect.any(Number),
 				ignoredStepCount: expect.any(Number),
 				partialMigration: true,
 				// chunks: expect.any(Array)

meteor/server/migration/databaseMigration.ts

@@ -87,7 +87,6 @@ export interface PreparedMigration {
 	steps: MigrationStepInternal[]
 	migrationNeeded: boolean
 	automaticStepCount: number
-	manualStepCount: number
 	ignoredStepCount: number
 	partialMigration: boolean
 }
@@ -150,7 +149,6 @@ export async function prepareMigration(returnAllChunks?: boolean): Promise<Prepa
 	})
 
 	let automaticStepCount = 0
-	let manualStepCount = 0
 	let ignoredStepCount = 0
 
 	let partialMigration = false
@@ -226,11 +224,8 @@ export async function prepareMigration(returnAllChunks?: boolean): Promise<Prepa
 	for (const step of Object.values<MigrationStepInternal>(migrationSteps)) {
 		stepsHash.push(step.id)
 		step.chunk._steps.push(step.id)
-		if (!step.canBeRunAutomatically) {
-			manualStepCount++
-		} else {
-			automaticStepCount++
-		}
+
+		automaticStepCount++
 	}
 
 	// Only return the chunks which has steps in them:
@@ -251,7 +246,6 @@ export async function prepareMigration(returnAllChunks?: boolean): Promise<Prepa
 		steps: steps,
 		migrationNeeded: migrationNeeded,
 		automaticStepCount: automaticStepCount,
-		manualStepCount: manualStepCount,
 		ignoredStepCount: ignoredStepCount,
 		partialMigration: partialMigration,
 	}
@@ -322,9 +316,7 @@ export async function runMigration(
 		}
 	}
 
-	logger.info(
-		`Migration: ${migration.automaticStepCount} automatic and ${migration.manualStepCount} manual steps (${migration.ignoredStepCount} ignored).`
-	)
+	logger.info(`Migration: ${migration.automaticStepCount} steps (${migration.ignoredStepCount} ignored).`)
 
 	for (const step of migration.steps) {
 		try {
@@ -367,12 +359,12 @@ export async function runMigration(
 
 	let migrationCompleted = false
 
-	if (migration.manualStepCount === 0 && !warningMessages.length) {
+	if (!warningMessages.length) {
 		// continue automatically with the next batch
 		logger.info('Migration: Automatically continuing with next batch..')
 		migration.partialMigration = false
 		const s = await getMigrationStatus()
-		if (s.migration.automaticStepCount > 0 || s.migration.manualStepCount > 0) {
+		if (s.migration.automaticStepCount > 0) {
 			try {
 				const res = await runMigration(s.migration.chunks, s.migration.hash, false, chunksLeft - 1)
 				if (res.migrationCompleted) {
@@ -426,13 +418,10 @@ export async function getMigrationStatus(): Promise<GetMigrationStatusResult> {
 		migrationNeeded: migration.migrationNeeded,
 
 		migration: {
-			canDoAutomaticMigration: migration.manualStepCount === 0,
-
 			hash: migration.hash,
 			chunks: migration.chunks,
 
 			automaticStepCount: migration.automaticStepCount,
-			manualStepCount: migration.manualStepCount,
 			ignoredStepCount: migration.ignoredStepCount,
 			partialMigration: migration.partialMigration,
 		},

packages/meteor-lib/src/api/migration.ts

@@ -101,10 +101,8 @@ export interface GetMigrationStatusResult {
 	migrationNeeded: boolean
 
 	migration: {
-		canDoAutomaticMigration: boolean
 		hash: string
 		automaticStepCount: number
-		manualStepCount: number
 		ignoredStepCount: number
 		partialMigration: boolean
 		chunks: Array<MigrationChunk>

packages/webui/src/client/ui/Settings/Migration.tsx

@@ -24,12 +24,10 @@ interface IState {
 	showAllSteps: boolean
 
 	migration?: {
-		canDoAutomaticMigration: boolean
 		hash: string
 		chunks: Array<MigrationChunk>
 		automaticStepCount: number
 		ignoredStepCount: number
-		manualStepCount: number
 		partialMigration: boolean
 	}
 	warnings: Array<string>
@@ -219,7 +217,7 @@ export const MigrationView = translateWithTracker<IProps, IState, ITrackedProps>
 
 								<p>
 									{t(
-										`This migration consists of ${this.state.migration.automaticStepCount} automatic steps and  ${this.state.migration.manualStepCount} manual steps (${this.state.migration.ignoredStepCount} steps are ignored).`
+										`This migration consists of ${this.state.migration.automaticStepCount} steps (${this.state.migration.ignoredStepCount} steps are ignored).`
 									)}
 								</p>
 
@@ -264,40 +262,17 @@ export const MigrationView = translateWithTracker<IProps, IState, ITrackedProps>
 										)}
 									</p>
 								) : null}
-								{this.state.migration.canDoAutomaticMigration ? (
-									<div>
-										<p>{t('The migration can be completed automatically.')}</p>
-										<Button
-											onClick={() => {
-												this.runMigration()
-											}}
-										>
-											<FontAwesomeIcon icon={faDatabase} className="me-2" />
-											<span>{t('Run automatic migration procedure')}</span>
-										</Button>
-									</div>
-								) : (
-									<div>
-										<p className="my-2">
-											{t('The migration procedure needs some help from you in order to complete, see below:')}
-										</p>
-										<button
-											className="btn btn-primary mt-4"
-											onClick={() => {
-												doModalDialog({
-													title: t('Double-check Values'),
-													message: t('Are you sure the values you have entered are correct?'),
-													onAccept: () => {
-														this.runMigration()
-													},
-												})
-											}}
-										>
-											<FontAwesomeIcon icon={faClipboardCheck} className="me-2" />
-											<span>{t('Run Migration Procedure')}</span>
-										</button>
-									</div>
-								)}
+								<div>
+									<p>{t('The migration can be completed automatically.')}</p>
+									<Button
+										onClick={() => {
+											this.runMigration()
+										}}
+									>
+										<FontAwesomeIcon icon={faDatabase} className="me-2" />
+										<span>{t('Run automatic migration procedure')}</span>
+									</Button>
+								</div>
 
 								{this.state.warnings.length ? (
 									<div>