don't be so fragile when comparing marketplace URLs (#2040)

* don't be so fragile when comparing marketplace URLs

* handle more edges

* minor

* clean up a little
This commit is contained in:
Matt Hill
2022-12-15 12:00:01 -07:00
committed by GitHub
parent 92cd85b204
commit fd7abdb8a4
7 changed files with 49 additions and 33 deletions

View File

@@ -9,7 +9,12 @@ import {
AbstractMarketplaceService,
MarketplacePkg,
} from '@start9labs/marketplace'
import { Emver, ErrorToastService, isEmptyObject } from '@start9labs/shared'
import {
Emver,
ErrorToastService,
isEmptyObject,
sameUrl,
} from '@start9labs/shared'
import {
DataModel,
PackageDataEntry,
@@ -71,7 +76,7 @@ export class MarketplaceShowControlsComponent {
} else {
const originalUrl = this.localPkg.installed?.['marketplace-url']
if (url !== originalUrl) {
if (!sameUrl(url, originalUrl)) {
const proceed = await this.presentAlertDifferentMarketplace(
url,
originalUrl,

View File

@@ -14,7 +14,7 @@ import {
MarketplacePkg,
StoreIdentity,
} from '@start9labs/marketplace'
import { Emver, isEmptyObject } from '@start9labs/shared'
import { Emver, isEmptyObject, sameUrl } from '@start9labs/shared'
import { Pipe, PipeTransform } from '@angular/core'
import { combineLatest, Observable } from 'rxjs'
import { PrimaryRendering } from '../../services/pkg-status-rendering.service'
@@ -194,7 +194,8 @@ export function marketplaceSame(
local: Record<string, PackageDataEntry>,
url: string,
): boolean {
return local[id]?.installed?.['marketplace-url'] === url
const localUrl = local[id]?.installed?.['marketplace-url']
return sameUrl(localUrl, url)
}
export function versionLower(