From 84775bb8ba07188a121a80ea66a1b61b9ddb8750 Mon Sep 17 00:00:00 2001 From: Drew Ansbacher Date: Mon, 17 Jan 2022 09:56:32 -0700 Subject: [PATCH] no more feature --- .../server-routes/server-show/server-show.page.html | 1 - .../server-routes/server-show/server-show.page.ts | 13 ------------- .../pages/server-routes/ssh-keys/ssh-keys.page.html | 9 +-------- .../pages/server-routes/ssh-keys/ssh-keys.page.ts | 3 --- ui/src/app/services/api/mock-patch.ts | 1 - ui/src/app/services/patch-db/data-model.ts | 1 - 6 files changed, 1 insertion(+), 27 deletions(-) diff --git a/ui/src/app/pages/server-routes/server-show/server-show.page.html b/ui/src/app/pages/server-routes/server-show/server-show.page.html index 771adf09c..4ef1fdf0b 100644 --- a/ui/src/app/pages/server-routes/server-show/server-show.page.html +++ b/ui/src/app/pages/server-routes/server-show/server-show.page.html @@ -39,7 +39,6 @@

- diff --git a/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/ui/src/app/pages/server-routes/server-show/server-show.page.ts index 629bc4417..2186d3cd0 100644 --- a/ui/src/app/pages/server-routes/server-show/server-show.page.ts +++ b/ui/src/app/pages/server-routes/server-show/server-show.page.ts @@ -112,7 +112,6 @@ export class ServerShowPage { action: () => this.navCtrl.navigateForward(['backup'], { relativeTo: this.route }), detail: true, disabled: of(false), - warning: of(false), }, { title: 'Restore From Backup', @@ -121,7 +120,6 @@ export class ServerShowPage { action: () => this.navCtrl.navigateForward(['restore'], { relativeTo: this.route }), detail: true, disabled: this.patch.watch$('server-info', 'status').pipe(map(status => [ServerStatus.Updated, ServerStatus.BackingUp].includes(status))), - warning: of(false), }, ], 'Insights': [ @@ -132,7 +130,6 @@ export class ServerShowPage { action: () => this.navCtrl.navigateForward(['specs'], { relativeTo: this.route }), detail: true, disabled: of(false), - warning: of(false), }, { title: 'Monitor', @@ -141,7 +138,6 @@ export class ServerShowPage { action: () => this.navCtrl.navigateForward(['metrics'], { relativeTo: this.route }), detail: true, disabled: of(false), - warning: of(false), }, { title: 'Logs', @@ -150,7 +146,6 @@ export class ServerShowPage { action: () => this.navCtrl.navigateForward(['logs'], { relativeTo: this.route }), detail: true, disabled: of(false), - warning: of(false), }, ], 'Settings': [ @@ -161,7 +156,6 @@ export class ServerShowPage { action: () => this.navCtrl.navigateForward(['preferences'], { relativeTo: this.route }), detail: true, disabled: of(false), - warning: of(false), }, { title: 'LAN', @@ -170,7 +164,6 @@ export class ServerShowPage { action: () => this.navCtrl.navigateForward(['lan'], { relativeTo: this.route }), detail: true, disabled: of(false), - warning: of(false), }, { title: 'SSH', @@ -179,7 +172,6 @@ export class ServerShowPage { action: () => this.navCtrl.navigateForward(['ssh'], { relativeTo: this.route }), detail: true, disabled: of(false), - warning: this.patch.watch$('ui', 'has-ssh-key').pipe(map(hasSSHKey => !hasSSHKey)), }, { @@ -189,7 +181,6 @@ export class ServerShowPage { action: () => this.navCtrl.navigateForward(['wifi'], { relativeTo: this.route }), detail: true, disabled: of(false), - warning: of(false), }, { title: 'Active Sessions', @@ -198,7 +189,6 @@ export class ServerShowPage { action: () => this.navCtrl.navigateForward(['sessions'], { relativeTo: this.route }), detail: true, disabled: of(false), - warning: of(false), }, ], 'Power': [ @@ -209,7 +199,6 @@ export class ServerShowPage { action: () => this.presentAlertRestart(), detail: false, disabled: of(false), - warning: of(false), }, { title: 'Shutdown', @@ -218,7 +207,6 @@ export class ServerShowPage { action: () => this.presentAlertShutdown(), detail: false, disabled: of(false), - warning: of(false), }, ], } @@ -236,6 +224,5 @@ interface ServerSettings { action: Function detail: boolean disabled: Observable - warning: Observable }[] } diff --git a/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html b/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html index 81ab47821..66d17fffa 100644 --- a/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html +++ b/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html @@ -13,14 +13,7 @@ - - -

- We highly recommend adding an SSH key to your Embassy. It can be useful for debugging should anything go wrong. We do not recommend using your SSH key unless (1) you have advanced technical knowledge of the command line or (2) are following the guidance of a Start 9 support representitive. - View instructions -

- -

+

Adding SSH keys to your Embassy is useful for command line access, as well as for debugging purposes. View instructions

diff --git a/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts b/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts index 352f029df..60e254ca7 100644 --- a/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts +++ b/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts @@ -68,9 +68,6 @@ export class SSHKeysPage { try { const key = await this.embassyApi.addSshKey({ key: pubkey }) this.sshKeys.push(key) - if (!this.patch.getData().ui['has-ssh-key']) { - await this.embassyApi.setDbValue({ pointer: '/has-ssh-key', value: true }) - } } finally { loader.dismiss() } diff --git a/ui/src/app/services/api/mock-patch.ts b/ui/src/app/services/api/mock-patch.ts index 02254f186..bac9a344e 100644 --- a/ui/src/app/services/api/mock-patch.ts +++ b/ui/src/app/services/api/mock-patch.ts @@ -7,7 +7,6 @@ export const mockPatchData: DataModel = { 'pkg-order': [], 'ack-welcome': '1.0.0', 'ack-share-stats': false, - 'has-ssh-key': false, }, 'server-info': { 'id': 'embassy-abcdefgh', diff --git a/ui/src/app/services/patch-db/data-model.ts b/ui/src/app/services/patch-db/data-model.ts index 85e351c6e..02a454f6d 100644 --- a/ui/src/app/services/patch-db/data-model.ts +++ b/ui/src/app/services/patch-db/data-model.ts @@ -13,7 +13,6 @@ export interface UIData { 'pkg-order': string[] 'ack-welcome': string // EOS version 'ack-share-stats': boolean - 'has-ssh-key': boolean } export interface ServerInfo {