From 8d00c22b135b7be2b8a4b8e817c34d990814e526 Mon Sep 17 00:00:00 2001
From: Jamie Waese <120480244+jamiewaese-uncharted@users.noreply.github.com>
Date: Wed, 24 May 2023 13:00:52 -0400
Subject: [PATCH 1/4] overview page updates

- autoload overview page on fresh loads
- minor styling updates
---
 .../src/components/asset/tera-asset.vue          |  4 ++--
 .../project/components/tera-project-overview.vue |  8 ++++----
 .../hmi-client/src/page/project/tera-project.vue | 16 ++++++++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/packages/client/hmi-client/src/components/asset/tera-asset.vue b/packages/client/hmi-client/src/components/asset/tera-asset.vue
index 966eed3129..3a72664a2f 100644
--- a/packages/client/hmi-client/src/components/asset/tera-asset.vue
+++ b/packages/client/hmi-client/src/components/asset/tera-asset.vue
@@ -188,11 +188,11 @@ header section:deep(> input) {
 
 .overline,
 .authors {
-	color: var(--primary-color-dark);
+	color: var(--text-color-primary);
 }
 
 .authors i {
-	color: var(--text-color-subdued);
+	color: var(--text-color-primary);
 	margin-right: 0.5rem;
 }
 
diff --git a/packages/client/hmi-client/src/page/project/components/tera-project-overview.vue b/packages/client/hmi-client/src/page/project/components/tera-project-overview.vue
index 5c4110a68c..3d8cb83357 100644
--- a/packages/client/hmi-client/src/page/project/components/tera-project-overview.vue
+++ b/packages/client/hmi-client/src/page/project/components/tera-project-overview.vue
@@ -72,7 +72,7 @@
 					</Button>
 					<Button size="large" class="p-button p-button-secondary quick-link-button">
 						<compare-models-icon class="icon" />
-						<span class="p-button-label">Compare Models</span>
+						<span class="p-button-label">Compare models</span>
 					</Button>
 					<Button
 						label="New simulation"
@@ -331,7 +331,7 @@ section {
 }
 
 .description {
-	margin-top: 0.5rem;
+	margin-top: 1rem;
 	margin-bottom: 0.5rem;
 }
 
@@ -407,8 +407,8 @@ button .icon {
 
 .keyword-search {
 	border-color: transparent;
-	padding-top: 0.75rem;
-	padding-bottom: 0.75rem;
+	padding-top: 0.5rem;
+	padding-bottom: 0.5rem;
 }
 
 .keyword-search:hover {
diff --git a/packages/client/hmi-client/src/page/project/tera-project.vue b/packages/client/hmi-client/src/page/project/tera-project.vue
index 45aa9dfe80..b05cecf6d0 100644
--- a/packages/client/hmi-client/src/page/project/tera-project.vue
+++ b/packages/client/hmi-client/src/page/project/tera-project.vue
@@ -336,6 +336,7 @@ const loadingTabIndex = ref<number | null>(null);
 function setActiveTab() {
 	activeTabIndex.value = tabStore.getActiveTabIndex(projectContext.value);
 	loadingTabIndex.value = null;
+	console.log('projectContext.value', projectContext.value);
 }
 
 function updateProject(id: IProject['id']) {
@@ -485,6 +486,21 @@ function formatAuthorTimestamp(username, timestamp) {
 	}
 	return `${username} on ${formatDdMmmYyyy(timestamp)}`;
 }
+
+// if this is a fresh load, open the overview page
+const freshLoad = ref(true);
+function openOverview() {
+	if (freshLoad.value) {
+		freshLoad.value = false;
+		tabStore.addTab(projectContext.value, {
+			assetName: 'Overview',
+			pageType: ProjectPages.OVERVIEW,
+			assetId: undefined
+		});
+		tabStore.setActiveTabIndex(projectContext.value, 0);
+	}
+}
+openOverview();
 </script>
 
 <style scoped>

From 19fe85ae1c2c85783899925288728519be908aa5 Mon Sep 17 00:00:00 2001
From: Jamie Waese <120480244+jamiewaese-uncharted@users.noreply.github.com>
Date: Wed, 24 May 2023 15:21:13 -0400
Subject: [PATCH 2/4] Open project overview on first load

---
 .../hmi-client/src/page/project/tera-project.vue  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/client/hmi-client/src/page/project/tera-project.vue b/packages/client/hmi-client/src/page/project/tera-project.vue
index b05cecf6d0..8a8495e8da 100644
--- a/packages/client/hmi-client/src/page/project/tera-project.vue
+++ b/packages/client/hmi-client/src/page/project/tera-project.vue
@@ -486,7 +486,7 @@ function formatAuthorTimestamp(username, timestamp) {
 	}
 	return `${username} on ${formatDdMmmYyyy(timestamp)}`;
 }
-
+/*
 // if this is a fresh load, open the overview page
 const freshLoad = ref(true);
 function openOverview() {
@@ -501,6 +501,19 @@ function openOverview() {
 	}
 }
 openOverview();
+
+*/
+watch(
+	() => projectContext.value,
+	() => {
+		if (projectContext.value) {
+			router.push({
+				name: RouteName.ProjectRoute,
+				params: { assetName: 'Overview', pageType: ProjectPages.OVERVIEW, assetId: undefined }
+			});
+		}
+	}
+);
 </script>
 
 <style scoped>

From 4552413c7a23f6fd323ad2f72cba169c8ef6c2c7 Mon Sep 17 00:00:00 2001
From: Jamie Waese <120480244+jamiewaese-uncharted@users.noreply.github.com>
Date: Wed, 24 May 2023 16:05:06 -0400
Subject: [PATCH 3/4] removed space under tab switcher on the model view page

---
 .../src/components/models/tera-model.vue      | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/client/hmi-client/src/components/models/tera-model.vue b/packages/client/hmi-client/src/components/models/tera-model.vue
index f46432b185..e944146517 100644
--- a/packages/client/hmi-client/src/components/models/tera-model.vue
+++ b/packages/client/hmi-client/src/components/models/tera-model.vue
@@ -4,6 +4,7 @@
 		:overline="model?.framework"
 		:is-editable="isEditable"
 		:is-creating-asset="assetId === ''"
+		:stretch-content="modelView === ModelView.MODEL"
 		@close-preview="emit('close-preview')"
 	>
 		<template #nav>
@@ -29,20 +30,23 @@
 						/>
 					</span>
 				</template>
+				<template #page-search>
+					<!-- TODO: Add search on page function (highlight matches and scroll to the next one?)-->
+					<span class="p-input-icon-left">
+						<i class="pi pi-search" />
+						<InputText
+							v-model="globalFilter['global'].value"
+							placeholder="Find in page"
+							class="p-inputtext-sm"
+						/>
+					</span>
+				</template>
 			</tera-asset-nav>
 		</template>
 		<template #name-input>
 			<InputText v-model="newModelName" placeholder="Title of new model" />
 		</template>
 		<template #edit-buttons>
-			<span class="p-input-icon-left">
-				<i class="pi pi-search" />
-				<InputText
-					v-model="globalFilter['global'].value"
-					class="p-inputtext-sm"
-					placeholder="Search keyword"
-				/>
-			</span>
 			<Button
 				v-if="assetId === ''"
 				@click="createNewModel"

From e657c9bf30819be7f669879a347f14560a3c657d Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Wed, 24 May 2023 17:23:07 -0400
Subject: [PATCH 4/4] rm comment

---
 .../src/page/project/tera-project.vue         | 29 -------------------
 1 file changed, 29 deletions(-)

diff --git a/packages/client/hmi-client/src/page/project/tera-project.vue b/packages/client/hmi-client/src/page/project/tera-project.vue
index a745ee7293..22e60dbc60 100644
--- a/packages/client/hmi-client/src/page/project/tera-project.vue
+++ b/packages/client/hmi-client/src/page/project/tera-project.vue
@@ -343,7 +343,6 @@ const loadingTabIndex = ref<number | null>(null);
 function setActiveTab() {
 	activeTabIndex.value = tabStore.getActiveTabIndex(projectContext.value);
 	loadingTabIndex.value = null;
-	console.log('projectContext.value', projectContext.value);
 }
 
 function updateProject(id: IProject['id']) {
@@ -500,34 +499,6 @@ function formatAuthorTimestamp(username, timestamp) {
 	}
 	return `${username} on ${formatDdMmmYyyy(timestamp)}`;
 }
-/*
-// if this is a fresh load, open the overview page
-const freshLoad = ref(true);
-function openOverview() {
-	if (freshLoad.value) {
-		freshLoad.value = false;
-		tabStore.addTab(projectContext.value, {
-			assetName: 'Overview',
-			pageType: ProjectPages.OVERVIEW,
-			assetId: undefined
-		});
-		tabStore.setActiveTabIndex(projectContext.value, 0);
-	}
-}
-openOverview();
-
-*/
-watch(
-	() => projectContext.value,
-	() => {
-		if (projectContext.value) {
-			router.push({
-				name: RouteName.ProjectRoute,
-				params: { assetName: 'Overview', pageType: ProjectPages.OVERVIEW, assetId: undefined }
-			});
-		}
-	}
-);
 </script>
 
 <style scoped>