Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 12:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui: testing

Browse Source
This commit is contained in:
Aaron Greenspan
2021-01-19 14:44:19 -07:00
committed by Aiden McClelland
parent e74ab3ce26
commit b72252b437
2 changed files with 14 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ui/src/app/services/startup-alerts.notifier.ts
View File

@@ -70,17 +70,20 @@ export class GlobalAlertsNotifier {
} }
private async presentOsWelcome (vi: string): Promise<void> { private async presentOsWelcome (vi: string): Promise<void> {
const modal = await this.modalCtrl.create({ return new Promise(async resolve => {
backdropDismiss: false, const modal = await this.modalCtrl.create({
component: OSWelcomePage, backdropDismiss: false,
presentingElement: await this.modalCtrl.getTop(), component: OSWelcomePage,
componentProps: { version: vi }, presentingElement: await this.modalCtrl.getTop(),
componentProps: { version: vi },
})
//kick this off async
this.apiService.acknowledgeOSWelcome(this.config.version).catch(e => {
console.error(`Unable to acknowledge OS welcome`, e)
})
await modal.present()
modal.onWillDismiss().then(() => resolve())
}) })
//kick this off async
this.apiService.acknowledgeOSWelcome(this.config.version).catch(e => {
console.error(`Unable to acknowledge OS welcome`, e)
})
await modal.present()
} }
private async presentAlertNewApps () { private async presentAlertNewApps () {

34
ui/src/app/services/sync.notifier.ts
View File

@@ -1,15 +1,12 @@
import { Injectable } from '@angular/core' import { Injectable } from '@angular/core'
import { ConfigService } from 'src/app/services/config.service' import { ConfigService } from 'src/app/services/config.service'
import { ToastController, NavController, ModalController, AlertController } from '@ionic/angular' import { ToastController, NavController, ModalController, AlertController } from '@ionic/angular'
import { ServerModel, S9Server, ServerStatus } from '../models/server-model' import { ServerModel, S9Server } from '../models/server-model'
import { OSWelcomePage } from '../modals/os-welcome/os-welcome.page' import { OSWelcomePage } from '../modals/os-welcome/os-welcome.page'
import { ApiService } from './api/api.service' import { ApiService } from './api/api.service'
import { Emver } from './emver.service' import { Emver } from './emver.service'
import { LoaderService } from './loader.service' import { LoaderService } from './loader.service'
import { OsUpdateService } from './os-update.service' import { OsUpdateService } from './os-update.service'
import { filter, take, tap } from 'rxjs/operators'
import { exists } from '../util/misc.util'
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
}) })
@@ -32,8 +29,6 @@ export class SyncNotifier {
async handleSpecial (server: Readonly<S9Server>): Promise<void> { async handleSpecial (server: Readonly<S9Server>): Promise<void> {
this.handleNotifications(server) this.handleNotifications(server)
this.handleOSWelcome(server)
if (!this.displayedWelcomeMessage) this.handleUpdateCheck(server)
} }
private async handleNotifications (server: Readonly<S9Server>) { private async handleNotifications (server: Readonly<S9Server>) {
@@ -71,35 +66,8 @@ export class SyncNotifier {
await toast.present() await toast.present()
this.serverModel.update(updates) this.serverModel.update(updates)
} }
private async handleOSWelcome (server: Readonly<S9Server>) {
if (server.welcomeAck || server.versionInstalled !== this.config.version || this.displayedWelcomeMessage) return
this.displayedWelcomeMessage = true
const modal = await this.modalCtrl.create({
backdropDismiss: false,
component: OSWelcomePage,
presentingElement: await this.modalCtrl.getTop(),
componentProps: {
version: server.versionInstalled,
},
})
modal.onDidDismiss().then(() => {
this.apiService.acknowledgeOSWelcome(this.config.version)
this.handleUpdateCheck(server)
})
await modal.present()
}
} }
// @TODO: remove
function debugSync (...desc: any[]) {
console.log(`sync: `, ...desc)
}
// return new Promise(async resolve => { // return new Promise(async resolve => {
// const confirm = await this.alertController.create({ // const confirm = await this.alertController.create({
// cssClass: 'alert-demo', // cssClass: 'alert-demo',