From 4bc0ae68f578f94fb5473a90d2db18d4c580944a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 30 Aug 2023 10:01:49 -0700
Subject: [PATCH] Revert "fix(core): conditionally hide expression evaluation
 warning messages (#9771)" (#10021) (#10022)

This reverts commit 7e3dd5053ccdb06ce067303062f90ae82b56bfc8.

(cherry picked from commit 62033d0fc6f0a953bd3f01e4452664b92fd02dfb)

Co-authored-by: Matt Gogerly <6519811+mattgogerly@users.noreply.github.com>
---
 .../pipeline/details/StageFailureMessage.tsx  | 34 ++++++-------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/packages/core/src/pipeline/details/StageFailureMessage.tsx b/packages/core/src/pipeline/details/StageFailureMessage.tsx
index ef04549f858..3368fd1c93c 100644
--- a/packages/core/src/pipeline/details/StageFailureMessage.tsx
+++ b/packages/core/src/pipeline/details/StageFailureMessage.tsx
@@ -73,33 +73,19 @@ export class StageFailureMessage extends React.Component<IStageFailureMessagePro
   }
 
   public render() {
-    const { message, messages, stage } = this.props;
+    const { message, messages } = this.props;
     const { isFailed, failedTask, failedExecutionId, failedStageName, failedStageId } = this.state;
 
-    let stageMessages = message && !messages.length ? [message] : messages;
-    if (stageMessages.length > 0) {
+    if (isFailed || failedTask || message || messages.length) {
       const exceptionTitle = isFailed ? (messages.length ? 'Exceptions' : 'Exception') : 'Warning';
-
-      // expression evaluation warnings can get really long and hide actual failure messages, source
-      // filter out expression evaluation failure messages if either:
-      // - there was a stage failure (and failed expressions don't fail the stage)
-      // - expression evaluation was explicitly disabled for the stage(as Orca still processes expressions and populates
-      //   warnings when evaluation is disabled disabled)
-      const shouldFilterExpressionFailures =
-        (isFailed && !stage.context?.failOnFailedExpressions) || stage.context?.skipExpressionEvaluation;
-
-      if (shouldFilterExpressionFailures) {
-        stageMessages = stageMessages.filter((m) => !m.startsWith('Failed to evaluate'));
-
-        if (stageMessages.length === 0) {
-          // no messages to be displayed after filtering
-          return null;
-        }
-      }
-
-      const displayMessages = stageMessages.map((m, i) => (
-        <Markdown key={i} message={m || StageFailureMessages.NO_REASON_PROVIDED} className="break-word" />
-      ));
+      const displayMessages =
+        message || !messages.length ? (
+          <Markdown message={message || StageFailureMessages.NO_REASON_PROVIDED} className="break-word" />
+        ) : (
+          messages.map((m, i) => (
+            <Markdown key={i} message={m || StageFailureMessages.NO_REASON_PROVIDED} className="break-word" />
+          ))
+        );
 
       if (displayMessages) {
         return (