From 8b1ade17936c78aabd646c432799a2d71cb61c91 Mon Sep 17 00:00:00 2001
From: Milorad Filipovic <milorad@n8n.io>
Date: Fri, 22 Dec 2023 11:39:13 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=20Merging=20stale=20data=20icon=20wit?=
 =?UTF-8?q?h=20execution=20status?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor-ui/src/components/OutputPanel.vue    | 17 +----------------
 packages/editor-ui/src/components/RunInfo.vue   | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/packages/editor-ui/src/components/OutputPanel.vue b/packages/editor-ui/src/components/OutputPanel.vue
index bea8753aa3f03..2d0061be3b11b 100644
--- a/packages/editor-ui/src/components/OutputPanel.vue
+++ b/packages/editor-ui/src/components/OutputPanel.vue
@@ -40,23 +40,8 @@
 					v-show="!outputPanelEditMode.enabled"
 					:taskData="runTaskData"
 					:hasStaleData="staleData"
+					:hasPinData="hasPinData"
 				/>
-				<n8n-info-tip
-					theme="warning"
-					type="tooltip"
-					tooltipPlacement="right"
-					v-if="hasNodeRun && staleData"
-				>
-					<span
-						v-html="
-							$locale.baseText(
-								hasPinData
-									? 'ndv.output.staleDataWarning.pinData'
-									: 'ndv.output.staleDataWarning.regular',
-							)
-						"
-					></span>
-				</n8n-info-tip>
 			</div>
 		</template>
 
diff --git a/packages/editor-ui/src/components/RunInfo.vue b/packages/editor-ui/src/components/RunInfo.vue
index bae788efe525d..64e14b66e6900 100644
--- a/packages/editor-ui/src/components/RunInfo.vue
+++ b/packages/editor-ui/src/components/RunInfo.vue
@@ -1,10 +1,21 @@
 <template>
+	<n8n-info-tip theme="warning" type="tooltip" tooltipPlacement="right" v-if="hasStaleData">
+		<span
+			v-html="
+				$locale.baseText(
+					hasPinData
+						? 'ndv.output.staleDataWarning.pinData'
+						: 'ndv.output.staleDataWarning.regular',
+				)
+			"
+		></span>
+	</n8n-info-tip>
 	<n8n-info-tip
-		v-if="runMetadata"
+		v-else-if="runMetadata"
 		type="tooltip"
 		:theme="theme"
-		:tooltipPlacement="hasStaleData ? 'left' : 'right'"
 		:data-test-id="`node-run-info-${theme}`"
+		tooltipPlacement="right"
 	>
 		<div>
 			<n8n-text :bold="true" size="small"
@@ -35,6 +46,7 @@ export default defineComponent({
 	props: {
 		taskData: {}, // ITaskData
 		hasStaleData: Boolean,
+		hasPinData: Boolean,
 	},
 
 	computed: {