Update types

projects/plugins/protect/src/js/data/scan/use-fixers-mutation.ts

@@ -21,9 +21,7 @@ export default function useFixersMutation(): UseMutationResult {
 				throw new Error( data.error );
 			}
 
-			const isThreatLevelError = Object.values( data.threats ).every(
-				( threat: { error?: string } ) => Boolean( threat.error )
-			);
+			const isThreatLevelError = Object.values( data.threats ).every( threat => 'error' in threat );
 
 			// Handle a threat level error
 			if ( isThreatLevelError ) {

projects/plugins/protect/src/js/types/fixers.ts

@@ -1,42 +1,40 @@
 export type FixerStatus = 'not_started' | 'in_progress' | 'fixed' | 'not_fixed';
 
-// Discriminated union for top-level error
-export type FixersStatusTopLevelError = {
-	ok: false; // Discriminator for overall failure
-	error: string; // When `ok` is false, top-level error is required
+/**
+ * Threat Fix Status
+ *
+ * Individual fixer status for a threat.
+ */
+export type ThreatFixStatusError = {
+	error: string;
 };
 
-// Discriminated union for threat-level errors
-export type FixersStatusThreatError = {
-	ok: true; // Discriminator for overall success
-	threats: {
-		[ key: number ]: ThreatFixError; // At least one threat has an error
-	};
+export type ThreatFixStatusSuccess = {
+	status: FixerStatus;
+	last_updated: string;
 };
 
-// Discriminated union for success scenario
-export type FixersStatusSuccess = {
-	ok: true; // Discriminator for overall success
-	threats: {
-		[ key: number ]: ThreatFixStatusSuccess; // Threats with successful statuses
-	};
-};
+export type ThreatFixStatus = ThreatFixStatusError | ThreatFixStatusSuccess;
 
-// Union type for fixers status (top-level or threat-level error, or success)
-export type FixersStatus =
-	| FixersStatusTopLevelError
-	| FixersStatusThreatError
-	| FixersStatusSuccess;
+/**
+ * Fixers Status
+ *
+ * Overall status of all fixers.
+ */
+type FixersStatusBase = {
+	ok: boolean; // Discriminator for overall success
+};
 
-// Threat-level error (discriminated)
-export type ThreatFixError = {
-	error: string; // Discriminator for threat-level error
+export type FixersStatusError = FixersStatusBase & {
+	ok: false;
+	error: string;
 };
 
-// Threat-level success (discriminated)
-export type ThreatFixStatusSuccess = {
-	status: FixerStatus; // Threat fix status (one of 'not_started', 'in_progress', etc.)
-	last_updated: string; // Last updated timestamp
+export type FixersStatusSuccess = FixersStatusBase & {
+	ok: true;
+	threats: {
+		[ key: number ]: ThreatFixStatus;
+	};
 };
 
-export type ThreatFixStatus = ThreatFixError | ThreatFixStatusSuccess;
+export type FixersStatus = FixersStatusSuccess | FixersStatusError;