From ad8d1ff850f7c5cb2f332886569af778112645f3 Mon Sep 17 00:00:00 2001
From: Matt Hill <matthewonthemoon@gmail.com>
Date: Sun, 27 Feb 2022 22:18:26 -0700
Subject: [PATCH] dont nav to app show when launching app ui from list

---
 .../app-list/app-list-pkg/app-list-pkg.component.html        | 2 +-
 .../app-list/app-list-pkg/app-list-pkg.component.ts          | 4 +++-
 .../developer-routes/developer-list/developer-list.page.html | 2 +-
 .../developer-routes/developer-list/developer-list.page.ts   | 5 +----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html b/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
index d446c324a..3913387e9 100644
--- a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
+++ b/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
@@ -24,7 +24,7 @@
     slot="end"
     fill="clear"
     color="primary"
-    (click)="launchUi()"
+    (click)="launchUi($event)"
     [disabled]="!(pkg.entry.state | isLaunchable: status:manifest.interfaces)"
   >
     <ion-icon slot="icon-only" name="open-outline"></ion-icon>
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts b/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
index 1f7f0ed56..5fc139f5b 100644
--- a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
+++ b/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
@@ -28,7 +28,9 @@ export class AppListPkgComponent {
     return this.pkg.entry.manifest
   }
 
-  launchUi(): void {
+  launchUi(e: Event): void {
+    e.stopPropagation()
+    e.preventDefault()
     this.launcherService.launch(this.pkg.entry)
   }
 }
diff --git a/frontend/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.html b/frontend/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.html
index e266e922f..4fecacf35 100644
--- a/frontend/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.html
+++ b/frontend/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.html
@@ -23,7 +23,7 @@
   <ion-item
     button
     *ngFor="let entry of devData | keyvalue"
-    (click)="goToProject(entry.key)"
+    [routerLink]="[entry.key]"
   >
     <p>{{ entry.value.name }}</p>
     <ion-button
diff --git a/frontend/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.ts b/frontend/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.ts
index 8285b67f7..1898e786b 100644
--- a/frontend/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.ts
+++ b/frontend/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.ts
@@ -79,6 +79,7 @@ export class DeveloperListPage {
 
   async presentAction(id: string, event: Event) {
     event.stopPropagation()
+    event.preventDefault()
     const buttons: ActionSheetButton[] = [
       {
         text: 'Edit Name',
@@ -222,10 +223,6 @@ export class DeveloperListPage {
       loader.dismiss()
     }
   }
-
-  async goToProject(id: string) {
-    await this.navCtrl.navigateForward([id], { relativeTo: this.route })
-  }
 }
 
 const SAMPLE_INSTUCTIONS = `# Create Instructions using Markdown! :)`