mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-31 04:23:40 +00:00
fix: extract correct manifest in updating state (#3004)
This commit is contained in:
@@ -4,17 +4,16 @@ import {
|
|||||||
Component,
|
Component,
|
||||||
inject,
|
inject,
|
||||||
input,
|
input,
|
||||||
Input,
|
|
||||||
} from '@angular/core'
|
} from '@angular/core'
|
||||||
import { Router } from '@angular/router'
|
import { Router } from '@angular/router'
|
||||||
import {
|
import {
|
||||||
MarketplaceLinksComponent,
|
|
||||||
MarketplaceFlavorsComponent,
|
|
||||||
MarketplaceAboutComponent,
|
MarketplaceAboutComponent,
|
||||||
MarketplaceDependenciesComponent,
|
MarketplaceDependenciesComponent,
|
||||||
|
MarketplaceFlavorsComponent,
|
||||||
|
MarketplaceLinksComponent,
|
||||||
MarketplacePackageHeroComponent,
|
MarketplacePackageHeroComponent,
|
||||||
MarketplaceVersionsComponent,
|
|
||||||
MarketplaceReleaseNotesComponent,
|
MarketplaceReleaseNotesComponent,
|
||||||
|
MarketplaceVersionsComponent,
|
||||||
} from '@start9labs/marketplace'
|
} from '@start9labs/marketplace'
|
||||||
import {
|
import {
|
||||||
DialogService,
|
DialogService,
|
||||||
@@ -28,10 +27,11 @@ import {
|
|||||||
combineLatest,
|
combineLatest,
|
||||||
filter,
|
filter,
|
||||||
map,
|
map,
|
||||||
|
shareReplay,
|
||||||
startWith,
|
startWith,
|
||||||
switchMap,
|
switchMap,
|
||||||
|
take,
|
||||||
} from 'rxjs'
|
} from 'rxjs'
|
||||||
import { shareReplay, take, tap } from 'rxjs/operators'
|
|
||||||
import { MarketplaceService } from 'src/app/services/marketplace.service'
|
import { MarketplaceService } from 'src/app/services/marketplace.service'
|
||||||
import { MarketplaceControlsComponent } from '../components/controls.component'
|
import { MarketplaceControlsComponent } from '../components/controls.component'
|
||||||
|
|
||||||
@@ -141,7 +141,6 @@ export class MarketplacePreviewComponent {
|
|||||||
readonly selectedVersion$ = new BehaviorSubject<string | null>(null)
|
readonly selectedVersion$ = new BehaviorSubject<string | null>(null)
|
||||||
|
|
||||||
readonly pkg$ = combineLatest([this.selectedVersion$, this.flavor$]).pipe(
|
readonly pkg$ = combineLatest([this.selectedVersion$, this.flavor$]).pipe(
|
||||||
tap(console.error),
|
|
||||||
switchMap(([version, flavor]) =>
|
switchMap(([version, flavor]) =>
|
||||||
this.marketplaceService
|
this.marketplaceService
|
||||||
.getPackage$(this.pkgId(), version, flavor)
|
.getPackage$(this.pkgId(), version, flavor)
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ export async function getAllPackages(
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function getManifest(pkg: PackageDataEntry): T.Manifest {
|
export function getManifest(pkg: PackageDataEntry): T.Manifest {
|
||||||
return isInstalling(pkg) || isRestoring(pkg)
|
return isInstalling(pkg) || isRestoring(pkg) || isUpdating(pkg)
|
||||||
? pkg.stateInfo.installingInfo.newManifest
|
? pkg.stateInfo.installingInfo.newManifest
|
||||||
: pkg.stateInfo.manifest!
|
: pkg.stateInfo.manifest!
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user