From 1d642d7b728b47d26bd41c70600599420748e412 Mon Sep 17 00:00:00 2001
From: armory-abedonik <106548537+armory-abedonik@users.noreply.github.com>
Date: Thu, 16 Nov 2023 20:30:05 +0100
Subject: [PATCH] feat: Add feature flag for multi block failure messages.
 (#10061)

(cherry picked from commit 374f724de221d68030a86e1f6452e3303390339a)

# Conflicts:
#	packages/app/src/settings.js
#	packages/kubernetes/src/pipelines/stages/deployManifest/manifestStatus/DeployStatus.tsx
---
 packages/app/src/settings.js                     |  9 +++++++++
 packages/core/src/config/settings.ts             |  1 +
 .../manifestStatus/DeployStatus.tsx              | 16 ++++++++++------
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/packages/app/src/settings.js b/packages/app/src/settings.js
index 62ce150c229..df7e18ce3a1 100644
--- a/packages/app/src/settings.js
+++ b/packages/app/src/settings.js
@@ -50,7 +50,15 @@ const managedServiceAccountsEnabled =
   process.env.MANAGED_SERVICE_ACCOUNTS_ENABLED === 'true';
 const managedResourcesEnabled =
   import.meta.env.VITE_MANAGED_RESOURCES_ENABLED === 'true' || process.env.MANAGED_RESOURCES_ENABLED === 'true';
+<<<<<<< HEAD
 const manualJudgmentParentPipelineEnabled = import.meta.env.MJ_PARENTPIPELINE_ENABLED === 'true' || false;
+=======
+const manualJudgmentParentPipelineEnabled = import.meta.env.MJ_PARENTPIPELINE_ENABLED !== 'false';
+const multiBlockFailureMessagesEnabled =
+  import.meta.env.MULTI_BLOCK_FAILURE_MESSAGES_ENABLED === 'true' ||
+  process.env.MULTI_BLOCK_FAILURE_MESSAGES_ENABLED === 'true' ||
+  false;
+>>>>>>> 374f724de2 (feat: Add feature flag for multi block failure messages. (#10061))
 const onDemandClusterThreshold =
   import.meta.env.VITE_ON_DEMAND_CLUSTER_THRESHOLD || process.env.ON_DEMAND_CLUSTER_THRESHOLD || '350';
 const reduxLoggerEnabled = import.meta.env.VITE_REDUX_LOGGER === 'true' || process.env.REDUX_LOGGER === 'true';
@@ -122,6 +130,7 @@ window.spinnakerSettings = {
     managedServiceAccounts: managedServiceAccountsEnabled,
     managedResources: managedResourcesEnabled,
     manualJudgmentParentPipeline: manualJudgmentParentPipelineEnabled,
+    multiBlockFailureMessages: multiBlockFailureMessagesEnabled,
     dynamicRollbackTimeout: dynamicRollbackTimeoutEnabled,
     notifications: false,
     pagerDuty: false,
diff --git a/packages/core/src/config/settings.ts b/packages/core/src/config/settings.ts
index 255c18bd6a5..b6008d83a60 100644
--- a/packages/core/src/config/settings.ts
+++ b/packages/core/src/config/settings.ts
@@ -38,6 +38,7 @@ export interface IFeatures {
   mdGitIntegration?: boolean;
   managedServiceAccounts?: boolean;
   managedResources?: boolean;
+  multiBlockFailureMessages?: boolean;
   notifications?: boolean;
   pagerDuty?: boolean;
   pipelines?: boolean;
diff --git a/packages/kubernetes/src/pipelines/stages/deployManifest/manifestStatus/DeployStatus.tsx b/packages/kubernetes/src/pipelines/stages/deployManifest/manifestStatus/DeployStatus.tsx
index 25170daa1d2..e3d3a8b2d7a 100644
--- a/packages/kubernetes/src/pipelines/stages/deployManifest/manifestStatus/DeployStatus.tsx
+++ b/packages/kubernetes/src/pipelines/stages/deployManifest/manifestStatus/DeployStatus.tsx
@@ -2,7 +2,7 @@ import { get } from 'lodash';
 import React from 'react';
 
 import type { IExecutionDetailsSectionProps, IManifest } from '@spinnaker/core';
-import { CollapsibleElement, ExecutionDetailsSection, StageFailureMessage } from '@spinnaker/core';
+import { CollapsibleElement, ExecutionDetailsSection, SETTINGS, StageFailureMessage } from '@spinnaker/core';
 
 import { ManifestStatus } from './ManifestStatus';
 import type { IStageManifest } from '../../../../manifest/manifest.service';
@@ -91,11 +91,15 @@ export class DeployStatus extends React.Component<IExecutionDetailsSectionProps,
     return (
       <div className="deploy-status">
         <ExecutionDetailsSection name={sectionName} current={currentSection}>
-          {stage.failureMessages.map((failureMessage) => (
-            <CollapsibleElement key={failureMessage} maxHeight={150}>
-              <StageFailureMessage stage={stage} message={failureMessage} />
-            </CollapsibleElement>
-          ))}
+          {SETTINGS.feature.multiBlockFailureMessages ? (
+            stage.failureMessages.map((failureMessage) => (
+              <CollapsibleElement key={failureMessage} maxHeight={150}>
+                <StageFailureMessage stage={stage} message={failureMessage} />
+              </CollapsibleElement>
+            ))
+          ) : (
+            <StageFailureMessage stage={stage} message={stage.failureMessage} />
+          )}
           {!!manifests?.length && (
             <div className="row">
               <div className="col-md-12">