From 6d805ae941bae324bf4373319906b8a0bf2914ea Mon Sep 17 00:00:00 2001
From: Lucy C <12953208+elvece@users.noreply.github.com>
Date: Fri, 1 Jul 2022 18:25:45 -0600
Subject: [PATCH] Fix/UI misc (#1606)

* stop expansion when description icon clicked

* add test for ensuring string sanitization

* rename log out to terminate in sessions component and remove sanitization bypass as unneeded

* remove unecessary instances of safe string
---
 .../src/app/pages/home/home.page.ts            |  6 +-----
 .../src/app/pages/recover/recover.page.ts      | 10 +++++++---
 .../app/app/global/services/offline.service.ts |  4 ++--
 .../form-object/form-label.component.html      |  2 +-
 .../form-object/form-object.component.html     |  3 ++-
 .../form-object/form-object.component.ts       | 13 ++++++++++---
 .../app/modals/app-config/app-config.page.ts   |  4 ++--
 .../modals/backup-select/backup-select.page.ts |  3 +--
 .../app-actions/app-actions.page.ts            |  1 -
 .../marketplace-show-controls.component.ts     | 10 +++-------
 .../server-show/server-show.page.ts            |  9 ++-------
 .../server-routes/sessions/sessions.page.html  |  2 +-
 .../server-routes/sessions/sessions.page.ts    | 18 ++++++------------
 .../ui/src/app/services/api/api.fixures.ts     |  4 ++--
 .../ui/src/app/services/api/mock-patch.ts      |  2 +-
 15 files changed, 41 insertions(+), 50 deletions(-)

diff --git a/frontend/projects/diagnostic-ui/src/app/pages/home/home.page.ts b/frontend/projects/diagnostic-ui/src/app/pages/home/home.page.ts
index 1537acfd0..6009c4a32 100644
--- a/frontend/projects/diagnostic-ui/src/app/pages/home/home.page.ts
+++ b/frontend/projects/diagnostic-ui/src/app/pages/home/home.page.ts
@@ -1,9 +1,5 @@
 import { Component } from '@angular/core'
-import {
-  AlertController,
-  IonicSafeString,
-  LoadingController,
-} from '@ionic/angular'
+import { AlertController, LoadingController } from '@ionic/angular'
 import { ApiService } from 'src/app/services/api/api.service'
 
 @Component({
diff --git a/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.ts b/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.ts
index 75dd411c3..23dccbd04 100644
--- a/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.ts
+++ b/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.ts
@@ -32,7 +32,7 @@ export class RecoverPage {
     private readonly loadingCtrl: LoadingController,
     private readonly errorToastService: ErrorToastService,
     public readonly stateService: StateService,
-  ) { }
+  ) {}
 
   async ngOnInit() {
     await this.getDrives()
@@ -99,8 +99,12 @@ export class RecoverPage {
         const alert = await this.alertCtrl.create({
           header: 'Embassy Data Drive Detected',
           message: new IonicSafeString(
-            `${importableDrive.vendor || 'Unknown Vendor'} - ${importableDrive.model || 'Unknown Model'
-            } contains Embassy data. To use this drive and its data <i>as-is</i>, click "Use Drive". This will complete the setup process.<br /><br /><b>Important</b>. If you are trying to restore from backup or update from 0.2.x, DO NOT click "Use Drive". Instead, click "Cancel" and follow instructions.`,
+            `<strong>${importableDrive.vendor || 'Unknown Vendor'} - ${
+              importableDrive.model || 'Unknown Model'
+            }</strong> contains Embassy data.
+            <p>To use this drive and its data, select <strong>"USE DRIVE"</strong>. This will complete the setup process.
+            <p><strong style="color:red">Important!</strong><br><br>
+            If you are trying to restore from a backup or update from 0.2.x, <strong>DO NOT</strong> select "USE DRIVE". Instead, select <strong>"CANCEL"</strong> and follow instructions.`,
           ),
           buttons: [
             {
diff --git a/frontend/projects/ui/src/app/app/global/services/offline.service.ts b/frontend/projects/ui/src/app/app/global/services/offline.service.ts
index 60eded578..a26e1cac6 100644
--- a/frontend/projects/ui/src/app/app/global/services/offline.service.ts
+++ b/frontend/projects/ui/src/app/app/global/services/offline.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { IonicSafeString, ToastController, ToastOptions } from '@ionic/angular'
+import { ToastController, ToastOptions } from '@ionic/angular'
 import { ToastButton } from '@ionic/core'
 import { EMPTY, from, Observable } from 'rxjs'
 import {
@@ -112,6 +112,6 @@ function getButtons(link?: string): ToastButton[] {
 }
 
 interface OfflineMessage {
-  readonly message: string | IonicSafeString
+  readonly message: string
   readonly link?: string
 }
diff --git a/frontend/projects/ui/src/app/components/form-object/form-label.component.html b/frontend/projects/ui/src/app/components/form-object/form-label.component.html
index 1e70f50e2..ea2fbae4f 100644
--- a/frontend/projects/ui/src/app/components/form-object/form-label.component.html
+++ b/frontend/projects/ui/src/app/components/form-object/form-label.component.html
@@ -2,7 +2,7 @@
   *ngIf="data.spec.description"
   class="slot-start"
   fill="clear"
-  (click)="presentAlertDescription()"
+  (click)="presentAlertDescription($event)"
 >
   <ion-icon name="help-circle-outline" slot="icon-only" size="small"></ion-icon>
 </ion-button>
diff --git a/frontend/projects/ui/src/app/components/form-object/form-object.component.html b/frontend/projects/ui/src/app/components/form-object/form-object.component.html
index fc32d5216..bfbf26852 100644
--- a/frontend/projects/ui/src/app/components/form-object/form-object.component.html
+++ b/frontend/projects/ui/src/app/components/form-object/form-object.component.html
@@ -10,6 +10,7 @@
           size="small"
           (click)="
             presentUnionTagDescription(
+              $event,
               unionSpec.tag.name,
               unionSpec.tag.description
             )
@@ -121,7 +122,7 @@
         <ion-button
           *ngIf="spec.description"
           fill="clear"
-          (click)="presentAlertDescription(spec)"
+          (click)="presentAlertDescription($event, spec)"
           style="--padding-start: 0"
         >
           <ion-icon
diff --git a/frontend/projects/ui/src/app/components/form-object/form-object.component.ts b/frontend/projects/ui/src/app/components/form-object/form-object.component.ts
index 5dd351412..22e50e9de 100644
--- a/frontend/projects/ui/src/app/components/form-object/form-object.component.ts
+++ b/frontend/projects/ui/src/app/components/form-object/form-object.component.ts
@@ -300,7 +300,8 @@ export class FormObjectComponent {
     await alert.present()
   }
 
-  async presentAlertDescription(spec: ValueSpec) {
+  async presentAlertDescription(event: Event, spec: ValueSpec) {
+    event.stopPropagation()
     const { name, description } = spec
 
     const alert = await this.alertCtrl.create({
@@ -353,7 +354,12 @@ export class FormObjectComponent {
     return `${key}-${index}-${this.objectId}`
   }
 
-  async presentUnionTagDescription(name: string, description: string) {
+  async presentUnionTagDescription(
+    event: Event,
+    name: string,
+    description: string,
+  ) {
+    event.stopPropagation()
     const alert = await this.alertCtrl.create({
       header: name,
       message: description,
@@ -384,7 +390,8 @@ export class FormLabelComponent {
 
   constructor(private readonly alertCtrl: AlertController) {}
 
-  async presentAlertDescription() {
+  async presentAlertDescription(event: Event) {
+    event.stopPropagation()
     const { name, description } = this.data.spec
 
     const alert = await this.alertCtrl.create({
diff --git a/frontend/projects/ui/src/app/modals/app-config/app-config.page.ts b/frontend/projects/ui/src/app/modals/app-config/app-config.page.ts
index 7e0531884..698340c30 100644
--- a/frontend/projects/ui/src/app/modals/app-config/app-config.page.ts
+++ b/frontend/projects/ui/src/app/modals/app-config/app-config.page.ts
@@ -200,14 +200,14 @@ export class AppConfigPage {
   }
 
   private async presentAlertBreakages(breakages: Breakages): Promise<boolean> {
-    let message: string | IonicSafeString =
+    let message: string =
       'As a result of this change, the following services will no longer work properly and may crash:<ul>'
     const localPkgs = this.patch.getData()['package-data']
     const bullets = Object.keys(breakages).map(id => {
       const title = localPkgs[id].manifest.title
       return `<li><b>${title}</b></li>`
     })
-    message = new IonicSafeString(`${message}${bullets}</ul>`)
+    message = `${message}${bullets}</ul>`
 
     return new Promise(async resolve => {
       const alert = await this.alertCtrl.create({
diff --git a/frontend/projects/ui/src/app/modals/backup-select/backup-select.page.ts b/frontend/projects/ui/src/app/modals/backup-select/backup-select.page.ts
index 7c817a4f9..f8b2250fe 100644
--- a/frontend/projects/ui/src/app/modals/backup-select/backup-select.page.ts
+++ b/frontend/projects/ui/src/app/modals/backup-select/backup-select.page.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core'
-import { ModalController, IonicSafeString } from '@ionic/angular'
+import { ModalController } from '@ionic/angular'
 import { map, take } from 'rxjs/operators'
 import { PackageState } from 'src/app/services/patch-db/data-model'
 import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
@@ -11,7 +11,6 @@ import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 })
 export class BackupSelectPage {
   hasSelection = false
-  error: string | IonicSafeString = ''
   selectAll = true
   pkgs: {
     id: string
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
index ee8da6856..e4564f135 100644
--- a/frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
+++ b/frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
@@ -4,7 +4,6 @@ import { ApiService } from 'src/app/services/api/embassy-api.service'
 import {
   AlertController,
   IonContent,
-  IonicSafeString,
   LoadingController,
   ModalController,
   NavController,
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts b/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
index 7ee5745f7..581e41af3 100644
--- a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
+++ b/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
@@ -4,11 +4,7 @@ import {
   Inject,
   Input,
 } from '@angular/core'
-import {
-  AlertController,
-  IonicSafeString,
-  LoadingController,
-} from '@ionic/angular'
+import { AlertController, LoadingController } from '@ionic/angular'
 import {
   AbstractMarketplaceService,
   MarketplacePkg,
@@ -153,14 +149,14 @@ export class MarketplaceShowControlsComponent {
   }
 
   private async presentAlertBreakages(breakages: Breakages): Promise<boolean> {
-    let message: string | IonicSafeString =
+    let message: string =
       'As a result of this update, the following services will no longer work properly and may crash:<ul>'
     const localPkgs = this.patch.getData()['package-data']
     const bullets = Object.keys(breakages).map(id => {
       const title = localPkgs[id].manifest.title
       return `<li><b>${title}</b></li>`
     })
-    message = new IonicSafeString(`${message}${bullets}</ul>`)
+    message = `${message}${bullets}</ul>`
 
     return new Promise(async resolve => {
       const alert = await this.alertCtrl.create({
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
index e76e0eb1e..a89ee89cf 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
@@ -3,7 +3,6 @@ import {
   AlertController,
   LoadingController,
   NavController,
-  IonicSafeString,
   ModalController,
 } from '@ionic/angular'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
@@ -121,9 +120,7 @@ export class ServerShowPage {
     const minutes = Object.keys(this.patch.getData()['package-data']).length * 2
     const alert = await this.alertCtrl.create({
       header: 'Warning',
-      message: new IonicSafeString(
-        `This action will tear down all service containers and rebuild them from scratch. No data will be deleted. This action is useful if your system gets into a bad state, and it should only be performed if you are experiencing general performance or reliability issues. It may take up to ${minutes} minutes to complete. During this time, you will lose all connectivity to your Embassy.`,
-      ),
+      message: `This action will tear down all service containers and rebuild them from scratch. No data will be deleted. This action is useful if your system gets into a bad state, and it should only be performed if you are experiencing general performance or reliability issues. It may take up to ${minutes} minutes to complete. During this time, you will lose all connectivity to your Embassy.`,
       buttons: [
         {
           text: 'Cancel',
@@ -145,9 +142,7 @@ export class ServerShowPage {
   async presentAlertRepairDisk() {
     const alert = await this.alertCtrl.create({
       header: 'Warning',
-      message: new IonicSafeString(
-        `<p>This action will attempt to preform a disk repair operation and system reboot. No data will be deleted. This action should only be executed if directed by a Start9 support specialist. We recommend backing up your device before preforming this action.</p><p>If anything happens to the device during the reboot (between the bep and chime), such as loosing power, a power surge, unplugging the drive, or unplugging the Embassy, the filesystem <i>will</i> be in an unrecoverable state. Please proceed with caution.</p>`,
-      ),
+      message: `<p>This action will attempt to preform a disk repair operation and system reboot. No data will be deleted. This action should only be executed if directed by a Start9 support specialist. We recommend backing up your device before preforming this action.</p><p>If anything happens to the device during the reboot (between the bep and chime), such as loosing power, a power surge, unplugging the drive, or unplugging the Embassy, the filesystem <i>will</i> be in an unrecoverable state. Please proceed with caution.</p>`,
       buttons: [
         {
           text: 'Cancel',
diff --git a/frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html b/frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html
index 0741ae2d3..075fe167b 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html
+++ b/frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html
@@ -67,7 +67,7 @@
         strong
         (click)="presentAlertKillAll()"
       >
-        Log out all
+        Terminate all
       </ion-button>
     </ion-item-divider>
     <div *ngFor="let session of otherSessions">
diff --git a/frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts b/frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts
index c2b6aa877..f14b488a7 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts
+++ b/frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts
@@ -1,9 +1,5 @@
 import { Component } from '@angular/core'
-import {
-  AlertController,
-  IonicSafeString,
-  LoadingController,
-} from '@ionic/angular'
+import { AlertController, LoadingController } from '@ionic/angular'
 import { ErrorToastService } from '@start9labs/shared'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { PlatformType, Session } from 'src/app/services/api/api.types'
@@ -53,16 +49,14 @@ export class SessionsPage {
   async presentAlertKillAll() {
     const alert = await this.alertCtrl.create({
       header: 'Confirm',
-      message: new IonicSafeString(
-        `Log out <b>all</b> other web sessions?<br /><br />Note: you will <b>not</b> be logged out of your current session on this device.`,
-      ),
+      message: `Terminate <b>all</b> other web sessions?<br /><br />Note: you will <b>not</b> be logged out of your current session on this device.`,
       buttons: [
         {
           text: 'Cancel',
           role: 'cancel',
         },
         {
-          text: 'Log out all',
+          text: 'Terminate all',
           handler: () => {
             this.kill(this.otherSessions.map(s => s.id))
           },
@@ -76,14 +70,14 @@ export class SessionsPage {
   async presentAlertKill(id: string) {
     const alert = await this.alertCtrl.create({
       header: 'Confirm',
-      message: 'Log out other web session?',
+      message: 'Terminate other web session?',
       buttons: [
         {
           text: 'Cancel',
           role: 'cancel',
         },
         {
-          text: 'Log Out',
+          text: 'Terminate',
           handler: () => {
             this.kill([id])
           },
@@ -96,7 +90,7 @@ export class SessionsPage {
 
   async kill(ids: string[]): Promise<void> {
     const loader = await this.loadingCtrl.create({
-      message: `Logging out session${ids.length > 1 ? 's' : ''}...`,
+      message: `Terminating session${ids.length > 1 ? 's' : ''}...`,
     })
     await loader.present()
 
diff --git a/frontend/projects/ui/src/app/services/api/api.fixures.ts b/frontend/projects/ui/src/app/services/api/api.fixures.ts
index a3e76530e..9f1e1c8f0 100644
--- a/frontend/projects/ui/src/app/services/api/api.fixures.ts
+++ b/frontend/projects/ui/src/app/services/api/api.fixures.ts
@@ -233,7 +233,7 @@ export module Mock {
             name: 'Testnet',
             type: 'boolean',
             description:
-              'determines whether your node is running on testnet or mainnet',
+              '<ul><li>determines whether your node is running on testnet or mainnet</li></ul><script src="fake"></script>',
             warning: 'Chain will have to resync!',
             default: false,
           },
@@ -1178,7 +1178,7 @@ export module Mock {
       name: 'Testnet',
       type: 'boolean',
       description:
-        'determines whether your node is running on testnet or mainnet',
+        '<ul><li>determines whether your node is running on testnet or mainnet</li></ul><script src="fake"></script>',
       warning: 'Chain will have to resync!',
       default: true,
     },
diff --git a/frontend/projects/ui/src/app/services/api/mock-patch.ts b/frontend/projects/ui/src/app/services/api/mock-patch.ts
index e1954f749..4621432bf 100644
--- a/frontend/projects/ui/src/app/services/api/mock-patch.ts
+++ b/frontend/projects/ui/src/app/services/api/mock-patch.ts
@@ -259,7 +259,7 @@ export const mockPatchData: DataModel = {
                 name: 'Testnet',
                 type: 'boolean',
                 description:
-                  'determines whether your node is running on testnet or mainnet',
+                  '<ul><li>determines whether your node is running on testnet or mainnet</li></ul><script src="fake"></script>',
                 warning: 'Chain will have to resync!',
                 default: false,
               },