Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-31 04:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui: concatObValues + comments

Browse Source
This commit is contained in:
Aaron Greenspan
2021-02-15 13:12:20 -07:00
committed by Aiden McClelland
parent 8ce43d808e
commit 397236c68e
7 changed files with 88 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ui/src/app/pages/apps-routes/app-installed-show/app-installed-show.page.html
View File

@@ -109,9 +109,9 @@
<p>
<a (click)="copyLan()">{{ vars.lanAddress }} <ion-icon name="copy-outline" class="tiny-icon"></ion-icon></a>
</p>
<p *ngIf="vars.testingLanConnection" style="display: flex; align-items: center; font-size: x-small">
<ion-text color="dark">Testing Connection</ion-text>
<ion-spinner style="height: 15px; margin-left: 5px;" name="dots" color="dark"></ion-spinner>
<p *ngIf="vars.testingLanConnection" style="display: flex; align-items: center; font-size: x-small; margin-top: 2px">
<ion-text color="warning">Testing Connection</ion-text>
<ion-spinner style="height: 15px; margin-left: 5px;" name="dots" color="warning"></ion-spinner>
</p>
</ion-label>
<ion-toggle (ionChange)="$lanToggled$.next($event)" [checked]="vars.lanEnabled" slot="end" class="lan-toggle" [disabled]="vars.status !== 'RUNNING' || vars.testingLanConnection"></ion-toggle>

6
ui/src/app/pages/apps-routes/app-installed-show/app-installed-show.page.scss
View File

@@ -66,3 +66,9 @@
--handle-width: 0.9em;
--handle-height: 0.9em;
}
.item-interactive-disabled:not(.item-multiple-inputs) ion-label {
cursor: default;
opacity: 1 !important;
pointer-events: auto !important;
}

46
ui/src/app/pages/apps-routes/app-installed-show/app-installed-show.page.ts
View File

@@ -13,13 +13,13 @@ import { LoaderService, markAsLoadingDuring$, markAsLoadingDuringP } from 'src/a
import { BehaviorSubject, combineLatest, from, merge, Observable, of, Subject } from 'rxjs'
import { wizardModal } from 'src/app/components/install-wizard/install-wizard.component'
import { WizardBaker } from 'src/app/components/install-wizard/prebaked-wizards'
import { catchError, concatMap, delay, distinctUntilChanged, filter, map, retryWhen, switchMap, take, tap } from 'rxjs/operators'
import { catchError, concatMap, delay, distinctUntilChanged, filter, map, mergeMap, retryWhen, switchMap, take, tap } from 'rxjs/operators'
import { Cleanup } from 'src/app/util/cleanup'
import { InformationPopoverComponent } from 'src/app/components/information-popover/information-popover.component'
import { Emver } from 'src/app/services/emver.service'
import { displayEmver } from 'src/app/pipes/emver.pipe'
import { ConfigService } from 'src/app/services/config.service'
import { squash } from 'src/app/util/rxjs.util'
import { concatObservableValues, squash } from 'src/app/util/rxjs.util'
@Component({
selector: 'app-installed-show',
templateUrl: './app-installed-show.page.html',
@@ -79,36 +79,28 @@ export class AppInstalledShowPage extends Cleanup {
concatMap(app =>
merge(
this.syncWhenDependencyInstalls(),
// new lan info from sync daemon
combineLatest([app.lanEnabled, this.$lanConnected$, app.status, this.$testingLanConnection$]).pipe(
filter(([_, __, s, alreadyConnecting]) => s === AppStatus.RUNNING && !alreadyConnecting),
concatMap(([enabled, connected]) => {
// console.log('enabled', enabled)
// console.log('connected', connected)
// new lan info or status info from sync daemon
combineLatest([app.lanEnabled, app.status]).pipe(
concatObservableValues<boolean, AppStatus, boolean, boolean>([this.$lanConnected$, this.$testingLanConnection$]),
concatMap(([enabled, status, connected, alreadyConnecting]) => {
if (status !== AppStatus.RUNNING) return of(this.$lanConnected$.next(false))
if (alreadyConnecting) return of()
if (enabled && !connected) return markAsLoadingDuring$(this.$testingLanConnection$, this.testLanConnection())
if (!enabled && connected) return of(this.$lanConnected$.next(false))
return of()
}),
),
// toggle lan
combineLatest([this.$lanToggled$, app.lanEnabled, this.$testingLanConnection$]).pipe(
filter(([_, __, alreadyLoading]) => !alreadyLoading),
map(([e, _]) => [(e as any).detail.checked, _]),
distinctUntilChanged(([toggled1], [toggled2]) => toggled1 === toggled2),
// if the app is already in the desired state, we bail
// this can happen because ionChange triggers when the [checked] value changes
filter(([uiEnabled, appEnabled]) => (uiEnabled && !appEnabled) || (!uiEnabled && appEnabled)),
concatMap( ([enabled]) => {
let o: Observable<void>
if (enabled) {
o = this.enableLan().pipe(concatMap(() => this.testLanConnection()))
} else {
o = this.disableLan()
}
return markAsLoadingDuring$(this.$testingLanConnection$, o).pipe(
catchError(e => this.setError(e)),
)
this.$lanToggled$.pipe(
map(toggleEvent => (toggleEvent as any).detail.checked),
concatObservableValues([app.lanEnabled, this.$testingLanConnection$]),
traceWheel('toggle'),
map( ([uiEnabled, appEnabled, alreadyConnecting]) => {
if (!alreadyConnecting && uiEnabled && !appEnabled) return this.enableLan().pipe(concatMap(() => this.testLanConnection()))
if (!alreadyConnecting && !uiEnabled) return this.disableLan() //do this even if app already disabled because of appModel update timeout hack.
return of()
}),
concatMap((o: Observable<void>) => this.testLanLoader(o)),
),
),
), //must be final in stack
@@ -117,6 +109,10 @@ export class AppInstalledShowPage extends Cleanup {
)
}
testLanLoader (o: Observable<void>): Observable<void> {
return markAsLoadingDuring$(this.$testingLanConnection$, o).pipe(catchError(e => this.setError(e)))
}
testLanConnection () : Observable<void> {
if (!this.app.lanAddress) return of()