From a6fedcff80a70986f3d46e0df0b76c504a50d90e Mon Sep 17 00:00:00 2001 From: Alex Inkin Date: Sat, 2 Aug 2025 11:51:38 +0700 Subject: [PATCH] fix: extract correct manifest in updating state (#3004) --- .../routes/marketplace/modals/preview.component.ts | 11 +++++------ web/projects/ui/src/app/utils/get-package-data.ts | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/web/projects/ui/src/app/routes/portal/routes/marketplace/modals/preview.component.ts b/web/projects/ui/src/app/routes/portal/routes/marketplace/modals/preview.component.ts index 157203fcd..3f4be59e0 100644 --- a/web/projects/ui/src/app/routes/portal/routes/marketplace/modals/preview.component.ts +++ b/web/projects/ui/src/app/routes/portal/routes/marketplace/modals/preview.component.ts @@ -4,17 +4,16 @@ import { Component, inject, input, - Input, } from '@angular/core' import { Router } from '@angular/router' import { - MarketplaceLinksComponent, - MarketplaceFlavorsComponent, MarketplaceAboutComponent, MarketplaceDependenciesComponent, + MarketplaceFlavorsComponent, + MarketplaceLinksComponent, MarketplacePackageHeroComponent, - MarketplaceVersionsComponent, MarketplaceReleaseNotesComponent, + MarketplaceVersionsComponent, } from '@start9labs/marketplace' import { DialogService, @@ -28,10 +27,11 @@ import { combineLatest, filter, map, + shareReplay, startWith, switchMap, + take, } from 'rxjs' -import { shareReplay, take, tap } from 'rxjs/operators' import { MarketplaceService } from 'src/app/services/marketplace.service' import { MarketplaceControlsComponent } from '../components/controls.component' @@ -141,7 +141,6 @@ export class MarketplacePreviewComponent { readonly selectedVersion$ = new BehaviorSubject(null) readonly pkg$ = combineLatest([this.selectedVersion$, this.flavor$]).pipe( - tap(console.error), switchMap(([version, flavor]) => this.marketplaceService .getPackage$(this.pkgId(), version, flavor) diff --git a/web/projects/ui/src/app/utils/get-package-data.ts b/web/projects/ui/src/app/utils/get-package-data.ts index 60bdc0bba..8524f5348 100644 --- a/web/projects/ui/src/app/utils/get-package-data.ts +++ b/web/projects/ui/src/app/utils/get-package-data.ts @@ -23,7 +23,7 @@ export async function getAllPackages( } 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.manifest! }