diff --git a/frontend/projects/marketplace/src/pipes/filter-packages.pipe.ts b/frontend/projects/marketplace/src/pipes/filter-packages.pipe.ts index 464c33c71..0ca8ae602 100644 --- a/frontend/projects/marketplace/src/pipes/filter-packages.pipe.ts +++ b/frontend/projects/marketplace/src/pipes/filter-packages.pipe.ts @@ -3,6 +3,7 @@ import Fuse from 'fuse.js' import { MarketplacePkg } from '../types/marketplace-pkg' import { MarketplaceManifest } from '../types/marketplace-manifest' +import { Emver } from '@start9labs/shared' const defaultOps = { isCaseSensitive: false, @@ -29,6 +30,8 @@ const defaultOps = { name: 'filterPackages', }) export class FilterPackagesPipe implements PipeTransform { + constructor(private readonly emver: Emver) {} + transform( packages: MarketplacePkg[] | null, query: string, @@ -49,7 +52,10 @@ export class FilterPackagesPipe implements PipeTransform { return packages.filter( ({ manifest }) => local[manifest.id] && - manifest.version !== local[manifest.id].manifest.version, + this.emver.compare( + manifest.version, + local[manifest.id].manifest.version, + ) === 1, ) } diff --git a/frontend/projects/shared/src/pipes/emver/emver.pipe.ts b/frontend/projects/shared/src/pipes/emver/emver.pipe.ts index 4b82ff80f..5c32f1675 100644 --- a/frontend/projects/shared/src/pipes/emver/emver.pipe.ts +++ b/frontend/projects/shared/src/pipes/emver/emver.pipe.ts @@ -31,6 +31,7 @@ export class EmverComparesPipe implements PipeTransform { } } } +// left compared to right - if 1, version on left is higher; if 0, values the same; if -1, version on left is lower type SemverResult = 0 | 1 | -1 | 'comparison-impossible' @Pipe({ diff --git a/frontend/projects/ui/src/app/components/form-object/form-error.component.html b/frontend/projects/ui/src/app/components/form-object/form-error.component.html index 7980b910c..9321fed43 100644 --- a/frontend/projects/ui/src/app/components/form-object/form-error.component.html +++ b/frontend/projects/ui/src/app/components/form-object/form-error.component.html @@ -1,4 +1,4 @@ -
{{ spec.name }} is required
diff --git a/frontend/projects/ui/src/app/components/form-object/form-label.component.html b/frontend/projects/ui/src/app/components/form-object/form-label.component.html index dd555d560..1e70f50e2 100644 --- a/frontend/projects/ui/src/app/components/form-object/form-label.component.html +++ b/frontend/projects/ui/src/app/components/form-object/form-label.component.html @@ -1,24 +1,12 @@