@remit/ui 0.0.82 → 0.0.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/ui",
-  "version": "0.0.82",
+  "version": "0.0.83",
   "type": "module",
   "files": [
     "src"

package/src/components/selection-wizard.render.test.ts

@@ -582,6 +582,26 @@ describe("RunStepBody", () => {
 		assert.match(html, /Nothing has changed\./);
 	});
 
+	// A retry that could not be started is not a pass that never ran (#552): the
+	// pass that did run keeps its counts and its bar.
+	it("keeps a finished pass's counts when its retry could not be started", () => {
+		const html = renderToString(
+			createElement(RunStepBody, {
+				...runProps,
+				state: "backApplyRestartFailed",
+				scope: "standing",
+				matched: 1284,
+				applied: 1200,
+				failedCount: 84,
+			}),
+		);
+		assert.match(html, /1200 of 1284 moved/);
+		assert.match(html, /rejected 84/);
+		assert.match(html, /role="progressbar"/);
+		assert.doesNotMatch(html, /Nothing has changed/);
+		assert.doesNotMatch(html, /never started/);
+	});
+
 	// A poll that could not be read is not a run that never started (#526): the
 	// screen keeps the counts it has and says what it cannot see.
 	it("keeps a run that is going when its progress could not be read", () => {

package/src/lib/wizard-steps.test.ts

@@ -477,6 +477,7 @@ describe("runCopy", () => {
 			"backApplyComplete",
 			"backApplyFailed",
 			"backApplyStartFailed",
+			"backApplyRestartFailed",
 			"statusUnknown",
 			"filterSaved",
 			"runStopped",
@@ -540,6 +541,26 @@ describe("runCopy", () => {
 		assert.equal(started.showProgress, false);
 	});
 
+	it("keeps the counts of the pass that ran when its retry could not be started", () => {
+		// #552: the retry is a second pass over the same mail, so a retry that
+		// failed leaves the first pass's ending exactly where it was.
+		const once = outcome("backApplyRestartFailed", "once");
+		assert.equal(once.title, "The retry didn't start");
+		assert.match(once.detail, /10 of 12 moved/);
+		assert.match(once.detail, /rejected 2/);
+		assert.match(once.detail, /Check your connection/);
+		assert.doesNotMatch(once.detail, /Nothing has changed/);
+		assert.equal(once.tone, "warning");
+		assert.equal(once.retryLabel, "Retry 2");
+		assert.equal(once.showProgress, true);
+
+		const standing = outcome("backApplyRestartFailed", "standing");
+		assert.match(standing.title, /Rule saved/);
+		assert.doesNotMatch(standing.detail, /never started/);
+		assert.match(standing.detail, /keeps working on new mail/);
+		assert.equal(standing.retryLabel, "Retry 2");
+	});
+
 	it("keeps a run that is going when its progress could not be read", () => {
 		// A poll that failed says nothing about the job behind it (#526), so the
 		// screen never claims the action never started, and the way out of it is a

package/src/lib/wizard-steps.ts

@@ -301,6 +301,7 @@ export type RunState =
 	| "backApplyComplete"
 	| "backApplyFailed"
 	| "backApplyStartFailed"
+	| "backApplyRestartFailed"
 	| "statusUnknown"
 	| "filterSaved"
 	| "runStopped"
@@ -386,6 +387,7 @@ export const runCopy = ({
 			state === "backApplyRunning" ||
 			state === "backApplyComplete" ||
 			state === "backApplyFailed" ||
+			state === "backApplyRestartFailed" ||
 			state === "statusUnknown" ||
 			state === "runStopped",
 		failureListLabel: `Not ${done}`,
@@ -463,6 +465,22 @@ export const runCopy = ({
 			retryLabel: `Retry ${failed}`,
 		};
 	}
+	if (state === "backApplyRestartFailed") {
+		return {
+			...shared,
+			title: standing
+				? "Rule saved — the retry didn't start"
+				: "The retry didn't start",
+			detail: `${applied} of ${matched} ${done} · the mail server rejected ${failed}, which are still where they were.${
+				standing
+					? " The rule itself is saved and keeps working on new mail."
+					: ""
+			} Check your connection and try again.`,
+			tone: "warning",
+			dismissLabel: "Close",
+			retryLabel: `Retry ${failed}`,
+		};
+	}
 	if (state === "backApplyStartFailed") {
 		return {
 			...shared,