From 704e75e893a94e71091c840aa5608837c0617526 Mon Sep 17 00:00:00 2001
From: Faton Ramadani <faton.ramadani14@gmail.com>
Date: Mon, 5 Aug 2024 13:20:56 +0200
Subject: [PATCH] fix(frontend): fix tutorial for apps with the new topbar
 (#4186)

---
 .../tutorials/app/AppTutorial.svelte          |   6 +-
 .../src/lib/components/tutorials/utils.ts     | 172 +++++++++++++++++-
 2 files changed, 174 insertions(+), 4 deletions(-)

diff --git a/frontend/src/lib/components/tutorials/app/AppTutorial.svelte b/frontend/src/lib/components/tutorials/app/AppTutorial.svelte
index a4b6fa9313..f824df0c80 100644
--- a/frontend/src/lib/components/tutorials/app/AppTutorial.svelte
+++ b/frontend/src/lib/components/tutorials/app/AppTutorial.svelte
@@ -84,7 +84,7 @@
 					description:
 						'Click on a component to add it to your app. Here we will add a display component.',
 					onNextClick: () => {
-						if (!$selectedComponent?.includes('b')) {
+						if (!$selectedComponent?.includes('e')) {
 							addComponent('displaycomponent')
 						}
 
@@ -216,7 +216,7 @@
 			},
 
 			{
-				element: '#connect-output-a',
+				element: '#connect-output-d',
 				popover: {
 					title: 'Select the output',
 					description: ' ',
@@ -265,7 +265,7 @@
 					description:
 						'We can now type in the text input and see the result in the display component',
 					onNextClick: () => {
-						connectInlineRunnableInputToComponentOutput($app, 'b', 'x', 'a', 'result')
+						connectInlineRunnableInputToComponentOutput($app, 'e', 'x', 'd', 'result', 'integer')
 
 						$app = $app
 
diff --git a/frontend/src/lib/components/tutorials/utils.ts b/frontend/src/lib/components/tutorials/utils.ts
index d9ced283ae..73d9ccb6a0 100644
--- a/frontend/src/lib/components/tutorials/utils.ts
+++ b/frontend/src/lib/components/tutorials/utils.ts
@@ -1,4 +1,5 @@
 import type { FlowModule, OpenFlow } from '$lib/gen'
+import { deepEqual } from 'fast-equals'
 import { findGridItem } from '../apps/editor/appUtils'
 import type { App } from '../apps/types'
 
@@ -61,8 +62,177 @@ export function isFlowTainted(flow: OpenFlow) {
 	)
 }
 
+const emptyApp = {
+	grid: [
+		{
+			'3': {
+				fixed: false,
+				x: 0,
+				y: 0,
+				fullHeight: false,
+				w: 6,
+				h: 2
+			},
+			'12': {
+				fixed: false,
+				x: 0,
+				y: 0,
+				fullHeight: false,
+				w: 12,
+				h: 2
+			},
+			data: {
+				type: 'containercomponent',
+				configuration: {},
+				customCss: {
+					container: {
+						class: '!p-0',
+						style: ''
+					}
+				},
+				actions: [],
+				numberOfSubgrids: 1,
+				id: 'a'
+			},
+			id: 'a'
+		}
+	],
+	fullscreen: false,
+	unusedInlineScripts: [],
+	hiddenInlineScripts: [],
+	theme: {
+		type: 'path',
+		path: 'f/app_themes/theme_0'
+	},
+	subgrids: {
+		'a-0': [
+			{
+				'3': {
+					fixed: false,
+					x: 0,
+					y: 0,
+					fullHeight: false,
+					w: 6,
+					h: 1
+				},
+				'12': {
+					fixed: false,
+					x: 0,
+					y: 0,
+					fullHeight: false,
+					w: 6,
+					h: 1
+				},
+				data: {
+					type: 'textcomponent',
+					configuration: {
+						style: {
+							type: 'static',
+							value: 'Body'
+						},
+						copyButton: {
+							type: 'static',
+							value: false
+						},
+						tooltip: {
+							type: 'evalv2',
+							value: '',
+							fieldType: 'text',
+							expr: '`Author: ${ctx.author}`',
+							connections: [
+								{
+									componentId: 'ctx',
+									id: 'author'
+								}
+							]
+						},
+						disableNoText: {
+							type: 'static',
+							value: true,
+							fieldType: 'boolean'
+						}
+					},
+					componentInput: {
+						type: 'templatev2',
+						fieldType: 'template',
+						eval: '${ctx.summary}',
+						connections: [
+							{
+								id: 'summary',
+								componentId: 'ctx'
+							}
+						]
+					},
+					customCss: {
+						text: {
+							class: 'text-xl font-semibold whitespace-nowrap truncate',
+							style: ''
+						},
+						container: {
+							class: '',
+							style: ''
+						}
+					},
+					actions: [],
+					horizontalAlignment: 'left',
+					verticalAlignment: 'center',
+					id: 'b'
+				},
+				id: 'b'
+			},
+			{
+				'3': {
+					fixed: false,
+					x: 0,
+					y: 1,
+					fullHeight: false,
+					w: 3,
+					h: 1
+				},
+				'12': {
+					fixed: false,
+					x: 6,
+					y: 0,
+					fullHeight: false,
+					w: 6,
+					h: 1
+				},
+				data: {
+					type: 'recomputeallcomponent',
+					configuration: {},
+					actions: [],
+					menuItems: [],
+					horizontalAlignment: 'right',
+					verticalAlignment: 'center',
+					id: 'c'
+				},
+				id: 'c'
+			}
+		]
+	},
+	hideLegacyTopBar: true,
+	norefreshbar: false
+}
+
 export function isAppTainted(app: App) {
-	return !(app.grid.length === 0 && app.hiddenInlineScripts?.length === 0)
+	if (app.hideLegacyTopBar === true) {
+		// An empty app should have only have a topbar and no hidden inline scripts
+
+		if (Array.isArray(app.hiddenInlineScripts) && app.hiddenInlineScripts?.length > 0) {
+			return true
+		}
+
+		// New apps have only a single component which is the topbar
+		if (Array.isArray(app.grid) && app.grid.length > 1) {
+			return true
+		}
+
+		// Check if the current app is different from an empty app
+		return !deepEqual(app, emptyApp)
+	} else {
+		// For older apps,
+		return !(app.grid.length === 0 && app.hiddenInlineScripts?.length === 0)
+	}
 }
 
 export function updateFlowModuleById(