mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-26 02:11:53 +00:00
only when version higher and show after login (#2217)
* only when version higher and show after login * unused import
This commit is contained in:
@@ -9,12 +9,12 @@ import { PatchDB } from 'patch-db-client'
|
|||||||
import {
|
import {
|
||||||
combineLatest,
|
combineLatest,
|
||||||
filter,
|
filter,
|
||||||
|
first,
|
||||||
map,
|
map,
|
||||||
Observable,
|
Observable,
|
||||||
pairwise,
|
pairwise,
|
||||||
startWith,
|
startWith,
|
||||||
switchMap,
|
switchMap,
|
||||||
withLatestFrom,
|
|
||||||
} from 'rxjs'
|
} from 'rxjs'
|
||||||
import { AbstractMarketplaceService } from '@start9labs/marketplace'
|
import { AbstractMarketplaceService } from '@start9labs/marketplace'
|
||||||
import { MarketplaceService } from 'src/app/services/marketplace.service'
|
import { MarketplaceService } from 'src/app/services/marketplace.service'
|
||||||
@@ -69,8 +69,8 @@ export class MenuComponent {
|
|||||||
|
|
||||||
private readonly local$ = this.connectionService.connected$.pipe(
|
private readonly local$ = this.connectionService.connected$.pipe(
|
||||||
filter(Boolean),
|
filter(Boolean),
|
||||||
withLatestFrom(this.patch.watch$('package-data')),
|
switchMap(() => this.patch.watch$('package-data').pipe(first())),
|
||||||
switchMap(([_, outer]) =>
|
switchMap(outer =>
|
||||||
this.patch.watch$('package-data').pipe(
|
this.patch.watch$('package-data').pipe(
|
||||||
pairwise(),
|
pairwise(),
|
||||||
filter(([prev, curr]) =>
|
filter(([prev, curr]) =>
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import { PatchDB } from 'patch-db-client'
|
|||||||
import {
|
import {
|
||||||
DataModel,
|
DataModel,
|
||||||
PackageDataEntry,
|
PackageDataEntry,
|
||||||
PackageState,
|
|
||||||
} from 'src/app/services/patch-db/data-model'
|
} from 'src/app/services/patch-db/data-model'
|
||||||
import { MarketplaceService } from 'src/app/services/marketplace.service'
|
import { MarketplaceService } from 'src/app/services/marketplace.service'
|
||||||
import {
|
import {
|
||||||
@@ -179,16 +178,12 @@ export class FilterUpdatesPipe implements PipeTransform {
|
|||||||
pkgs: MarketplacePkg[],
|
pkgs: MarketplacePkg[],
|
||||||
local: Record<string, PackageDataEntry | undefined>,
|
local: Record<string, PackageDataEntry | undefined>,
|
||||||
): MarketplacePkg[] {
|
): MarketplacePkg[] {
|
||||||
return pkgs.filter(({ manifest }) => {
|
return pkgs.filter(
|
||||||
const localPkg = local[manifest.id]
|
({ manifest }) =>
|
||||||
|
|
||||||
return (
|
|
||||||
localPkg?.state === PackageState.Updating ||
|
|
||||||
this.emver.compare(
|
this.emver.compare(
|
||||||
manifest.version,
|
manifest.version,
|
||||||
localPkg?.installed?.manifest.version || '',
|
local[manifest.id]?.installed?.manifest.version || '',
|
||||||
) === 1
|
) === 1,
|
||||||
)
|
)
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user