no more feature

This commit is contained in:
Drew Ansbacher
2022-01-17 09:56:32 -07:00
committed by Aiden McClelland
parent 20d7f7b236
commit 84775bb8ba
6 changed files with 1 additions and 27 deletions

View File

@@ -39,7 +39,6 @@
</ng-container> </ng-container>
</p> </p>
</ion-label> </ion-label>
<ion-icon *ngIf="button.warning | async" slot="end" name="warning" color="warning" style="padding-right: 8px;"></ion-icon>
</ion-item> </ion-item>
</div> </div>
</ion-item-group> </ion-item-group>

View File

@@ -112,7 +112,6 @@ export class ServerShowPage {
action: () => this.navCtrl.navigateForward(['backup'], { relativeTo: this.route }), action: () => this.navCtrl.navigateForward(['backup'], { relativeTo: this.route }),
detail: true, detail: true,
disabled: of(false), disabled: of(false),
warning: of(false),
}, },
{ {
title: 'Restore From Backup', title: 'Restore From Backup',
@@ -121,7 +120,6 @@ export class ServerShowPage {
action: () => this.navCtrl.navigateForward(['restore'], { relativeTo: this.route }), action: () => this.navCtrl.navigateForward(['restore'], { relativeTo: this.route }),
detail: true, detail: true,
disabled: this.patch.watch$('server-info', 'status').pipe(map(status => [ServerStatus.Updated, ServerStatus.BackingUp].includes(status))), disabled: this.patch.watch$('server-info', 'status').pipe(map(status => [ServerStatus.Updated, ServerStatus.BackingUp].includes(status))),
warning: of(false),
}, },
], ],
'Insights': [ 'Insights': [
@@ -132,7 +130,6 @@ export class ServerShowPage {
action: () => this.navCtrl.navigateForward(['specs'], { relativeTo: this.route }), action: () => this.navCtrl.navigateForward(['specs'], { relativeTo: this.route }),
detail: true, detail: true,
disabled: of(false), disabled: of(false),
warning: of(false),
}, },
{ {
title: 'Monitor', title: 'Monitor',
@@ -141,7 +138,6 @@ export class ServerShowPage {
action: () => this.navCtrl.navigateForward(['metrics'], { relativeTo: this.route }), action: () => this.navCtrl.navigateForward(['metrics'], { relativeTo: this.route }),
detail: true, detail: true,
disabled: of(false), disabled: of(false),
warning: of(false),
}, },
{ {
title: 'Logs', title: 'Logs',
@@ -150,7 +146,6 @@ export class ServerShowPage {
action: () => this.navCtrl.navigateForward(['logs'], { relativeTo: this.route }), action: () => this.navCtrl.navigateForward(['logs'], { relativeTo: this.route }),
detail: true, detail: true,
disabled: of(false), disabled: of(false),
warning: of(false),
}, },
], ],
'Settings': [ 'Settings': [
@@ -161,7 +156,6 @@ export class ServerShowPage {
action: () => this.navCtrl.navigateForward(['preferences'], { relativeTo: this.route }), action: () => this.navCtrl.navigateForward(['preferences'], { relativeTo: this.route }),
detail: true, detail: true,
disabled: of(false), disabled: of(false),
warning: of(false),
}, },
{ {
title: 'LAN', title: 'LAN',
@@ -170,7 +164,6 @@ export class ServerShowPage {
action: () => this.navCtrl.navigateForward(['lan'], { relativeTo: this.route }), action: () => this.navCtrl.navigateForward(['lan'], { relativeTo: this.route }),
detail: true, detail: true,
disabled: of(false), disabled: of(false),
warning: of(false),
}, },
{ {
title: 'SSH', title: 'SSH',
@@ -179,7 +172,6 @@ export class ServerShowPage {
action: () => this.navCtrl.navigateForward(['ssh'], { relativeTo: this.route }), action: () => this.navCtrl.navigateForward(['ssh'], { relativeTo: this.route }),
detail: true, detail: true,
disabled: of(false), 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 }), action: () => this.navCtrl.navigateForward(['wifi'], { relativeTo: this.route }),
detail: true, detail: true,
disabled: of(false), disabled: of(false),
warning: of(false),
}, },
{ {
title: 'Active Sessions', title: 'Active Sessions',
@@ -198,7 +189,6 @@ export class ServerShowPage {
action: () => this.navCtrl.navigateForward(['sessions'], { relativeTo: this.route }), action: () => this.navCtrl.navigateForward(['sessions'], { relativeTo: this.route }),
detail: true, detail: true,
disabled: of(false), disabled: of(false),
warning: of(false),
}, },
], ],
'Power': [ 'Power': [
@@ -209,7 +199,6 @@ export class ServerShowPage {
action: () => this.presentAlertRestart(), action: () => this.presentAlertRestart(),
detail: false, detail: false,
disabled: of(false), disabled: of(false),
warning: of(false),
}, },
{ {
title: 'Shutdown', title: 'Shutdown',
@@ -218,7 +207,6 @@ export class ServerShowPage {
action: () => this.presentAlertShutdown(), action: () => this.presentAlertShutdown(),
detail: false, detail: false,
disabled: of(false), disabled: of(false),
warning: of(false),
}, },
], ],
} }
@@ -236,6 +224,5 @@ interface ServerSettings {
action: Function action: Function
detail: boolean detail: boolean
disabled: Observable<boolean> disabled: Observable<boolean>
warning: Observable<boolean>
}[] }[]
} }

View File

@@ -13,14 +13,7 @@
<!-- always --> <!-- always -->
<ion-item> <ion-item>
<ion-label> <ion-label>
<ion-item *ngIf="!patch.data.ui['has-ssh-key']"> <h2>
<ion-icon slot="start" color="warning" name="warning-outline" size="large"></ion-icon>
<h2>
We highly recommend adding an SSH key to your Embassy. It can be useful for debugging should anything go wrong. We <b>do not</b> recommend using your SSH key <b>unless</b> (1) you have advanced technical knowledge of the command line or (2) are following the guidance of a Start 9 support representitive.
<a [href]="docsUrl" target="_blank" rel="noreferrer">View instructions</a>
</h2>
</ion-item>
<h2 *ngIf="patch.data.ui['has-ssh-key']">
Adding SSH keys to your Embassy is useful for command line access, as well as for debugging purposes. Adding SSH keys to your Embassy is useful for command line access, as well as for debugging purposes.
<a [href]="docsUrl" target="_blank" rel="noreferrer">View instructions</a> <a [href]="docsUrl" target="_blank" rel="noreferrer">View instructions</a>
</h2> </h2>

View File

@@ -68,9 +68,6 @@ export class SSHKeysPage {
try { try {
const key = await this.embassyApi.addSshKey({ key: pubkey }) const key = await this.embassyApi.addSshKey({ key: pubkey })
this.sshKeys.push(key) this.sshKeys.push(key)
if (!this.patch.getData().ui['has-ssh-key']) {
await this.embassyApi.setDbValue({ pointer: '/has-ssh-key', value: true })
}
} finally { } finally {
loader.dismiss() loader.dismiss()
} }

View File

@@ -7,7 +7,6 @@ export const mockPatchData: DataModel = {
'pkg-order': [], 'pkg-order': [],
'ack-welcome': '1.0.0', 'ack-welcome': '1.0.0',
'ack-share-stats': false, 'ack-share-stats': false,
'has-ssh-key': false,
}, },
'server-info': { 'server-info': {
'id': 'embassy-abcdefgh', 'id': 'embassy-abcdefgh',

View File

@@ -13,7 +13,6 @@ export interface UIData {
'pkg-order': string[] 'pkg-order': string[]
'ack-welcome': string // EOS version 'ack-welcome': string // EOS version
'ack-share-stats': boolean 'ack-share-stats': boolean
'has-ssh-key': boolean
} }
export interface ServerInfo { export interface ServerInfo {