feat: return adlib action validation errors to client

Author: Ivan Maretić

meteor/server/api/rest/v1/playlists.ts

@@ -301,17 +301,6 @@ class PlaylistsServerAPI implements PlaylistsRestAPI {
 				}
 			)
 			if (ClientAPI.isClientResponseError(result)) return result
-			// Check if the action rejected the request
-			if (result.result?.errorMessage) {
-				return ClientAPI.responseError(
-					UserError.from(
-						new Error(result.result.errorMessage),
-						UserErrorMessage.InternalError,
-						undefined,
-						400
-					)
-				)
-			}
 			return ClientAPI.responseSuccess(result.result ?? {})
 		} else {
 			return ClientAPI.responseError(
@@ -383,12 +372,6 @@ class PlaylistsServerAPI implements PlaylistsRestAPI {
 			}
 		)
 		if (ClientAPI.isClientResponseError(result)) return result
-		// Check if the action rejected the request
-		if (result.result?.errorMessage) {
-			return ClientAPI.responseError(
-				UserError.from(new Error(result.result.errorMessage), UserErrorMessage.InternalError, undefined, 400)
-			)
-		}
 		return ClientAPI.responseSuccess(result.result ?? {})
 	}
 

packages/corelib/src/error.ts

@@ -116,7 +116,7 @@ const UserErrorMessagesTranslations: { [key in UserErrorMessage]: string } = {
 	[UserErrorMessage.DeviceAlreadyAttachedToStudio]: t(`Device is already attached to another studio.`),
 	[UserErrorMessage.ShowStyleBaseNotFound]: t(`ShowStyleBase not found!`),
 	[UserErrorMessage.NoMigrationsToApply]: t(`No migrations to apply`),
-	[UserErrorMessage.ValidationFailed]: t('Validation failed!'),
+	[UserErrorMessage.ValidationFailed]: t('Validation failed! {{message}}'),
 	[UserErrorMessage.AdlibTestingNotAllowed]: t(`Rehearsal mode is not allowed`),
 	[UserErrorMessage.AdlibTestingAlreadyActive]: t(`Rehearsal mode is already active`),
 	[UserErrorMessage.BucketNotFound]: t(`Bucket not found!`),

packages/corelib/src/worker/studio.ts

@@ -284,11 +284,6 @@ export interface ExecuteBucketAdLibOrActionProps extends RundownPlayoutPropsBase
 	externalId: string
 	triggerMode?: string
 }
-export interface ExecuteBucketAdLibOrActionProps extends RundownPlayoutPropsBase {
-	bucketId: BucketId
-	externalId: string
-	triggerMode?: string
-}
 export interface ExecuteActionResult {
 	queuedPartInstanceId?: PartInstanceId
 	taken?: boolean

packages/job-worker/src/playout/adlibAction.ts

@@ -271,13 +271,13 @@ export async function executeActionInner(
 		throw UserError.fromUnknown(err)
 	}
 
-	if (result && result.validationErrors) {
+	const validationErrors = result?.validationErrors ?? actionContext.requestError
+	if (validationErrors) {
+		const message = typeof validationErrors === 'string' ? validationErrors : JSON.stringify(validationErrors)
 		throw UserError.from(
-			new Error(
-				`AdLib Action "${actionParameters.actionId}" validation failed: ${JSON.stringify(result.validationErrors)}`
-			),
+			new Error(`AdLib Action "${actionParameters.actionId}" validation failed: ${message}`),
 			UserErrorMessage.ValidationFailed,
-			undefined,
+			{ message },
 			409
 		)
 	}
@@ -296,7 +296,6 @@ export async function executeActionInner(
 	return {
 		queuedPartInstanceId: actionContext.queuedPartInstanceId,
 		taken: actionContext.takeAfterExecute,
-		errorMessage: actionContext.requestError,
 	}
 }