diff --git a/web/package.json b/web/package.json index 2f91927e6..92c8870e1 100644 --- a/web/package.json +++ b/web/package.json @@ -13,6 +13,7 @@ "check:setup": "tsc --project projects/setup-wizard/tsconfig.json --noEmit --skipLibCheck", "check:ui": "tsc --project projects/ui/tsconfig.json --noEmit --skipLibCheck", "build:deps": "rm -rf .angular/cache && (cd ../patch-db/client && npm ci && npm run build) && (cd ../sdk && make bundle)", + "build:deps:win": "rimraf .angular/cache && (cd ../sdk && npm ci && npm run build) && (cd ../patch-db/client && npm ci && npm run build)", "build:install": "ng run install-wizard:build", "build:setup": "ng run setup-wizard:build", "build:ui": "ng run ui:build", diff --git a/web/projects/marketplace/src/components/menu/menu.component.html b/web/projects/marketplace/src/components/menu/menu.component.html index 61caf7d31..1279731c1 100644 --- a/web/projects/marketplace/src/components/menu/menu.component.html +++ b/web/projects/marketplace/src/components/menu/menu.component.html @@ -1,113 +1,108 @@
- -
- + +

+ {{ registry?.info?.name || 'Loading store...' }} +

+ + +
+ + +
diff --git a/web/projects/marketplace/src/components/menu/menu.component.ts b/web/projects/marketplace/src/components/menu/menu.component.ts index 453a1ce87..5eb580e30 100644 --- a/web/projects/marketplace/src/components/menu/menu.component.ts +++ b/web/projects/marketplace/src/components/menu/menu.component.ts @@ -5,10 +5,10 @@ import { Input, OnDestroy, } from '@angular/core' +import { MarketplaceConfig } from '@start9labs/shared' import { Subject, takeUntil } from 'rxjs' -import { AbstractMarketplaceService } from '../../services/marketplace.service' import { AbstractCategoryService } from '../../services/category.service' -import { MarketplaceConfig } from '@start9labs/shared' +import { StoreData } from '../../types' @Component({ selector: 'menu', @@ -20,10 +20,11 @@ export class MenuComponent implements OnDestroy { @Input({ required: true }) iconConfig!: MarketplaceConfig + @Input({ required: true }) + registry: (StoreData & { url?: string }) | null = null + private destroy$ = new Subject() - private readonly marketplaceService = inject(AbstractMarketplaceService) private readonly categoryService = inject(AbstractCategoryService) - readonly registry$ = this.marketplaceService.getRegistry$() category = '' query = '' open = false diff --git a/web/projects/marketplace/src/modals/release-notes.component.ts b/web/projects/marketplace/src/modals/release-notes.component.ts index d9010f81c..7c805d36a 100644 --- a/web/projects/marketplace/src/modals/release-notes.component.ts +++ b/web/projects/marketplace/src/modals/release-notes.component.ts @@ -1,6 +1,5 @@ import { CommonModule } from '@angular/common' import { ChangeDetectionStrategy, Component, inject } from '@angular/core' -import { MarketplacePkg } from '../../src/types' import { Exver, MarkdownPipeModule } from '@start9labs/shared' import { TuiButton, TuiDialogContext, TuiLoader } from '@taiga-ui/core' import { TuiAccordion } from '@taiga-ui/kit' @@ -8,26 +7,21 @@ import { POLYMORPHEUS_CONTEXT, PolymorpheusComponent, } from '@taiga-ui/polymorpheus' -import { map } from 'rxjs' -import { AbstractMarketplaceService } from '../services/marketplace.service' +import { MarketplacePkg } from '../../src/types' @Component({ standalone: true, template: ` - @if (notes$ | async; as notes) { - - @for (note of notes | keyvalue: asIsOrder; track $index) { - - {{ note.key }} - -
-
-
- } -
- } @else { - - } + + @for (note of notes | keyvalue: asIsOrder; track $index) { + + {{ note.key }} + +
+
+
+ } +
`, changeDetection: ChangeDetectionStrategy.OnPush, imports: [ @@ -43,26 +37,20 @@ export class ReleaseNotesComponent { private readonly pkg = inject>(POLYMORPHEUS_CONTEXT).data - readonly notes$ = inject(AbstractMarketplaceService) - .getRegistry$() - .pipe( - map(s => { - return Object.entries(this.pkg.otherVersions) - .filter( - ([v, _]) => - this.exver.getFlavor(v) === this.pkg.flavor && - this.exver.compareExver(this.pkg.version, v) === 1, - ) - .reduce( - (obj, [version, info]) => ({ - ...obj, - [version]: info.releaseNotes, - }), - { - [`${this.pkg.version} (current)`]: this.pkg.releaseNotes, - }, - ) + readonly notes = Object.entries(this.pkg.otherVersions) + .filter( + ([v, _]) => + this.exver.getFlavor(v) === this.pkg.flavor && + this.exver.compareExver(this.pkg.version, v) === 1, + ) + .reduce( + (obj, [version, info]) => ({ + ...obj, + [version]: info.releaseNotes, }), + { + [`${this.pkg.version} (current)`]: this.pkg.releaseNotes, + }, ) asIsOrder(a: any, b: any) { diff --git a/web/projects/marketplace/src/pages/show/additional/additional.component.html b/web/projects/marketplace/src/pages/show/additional/additional.component.html index 389ed2586..f4381eed6 100644 --- a/web/projects/marketplace/src/pages/show/additional/additional.component.html +++ b/web/projects/marketplace/src/pages/show/additional/additional.component.html @@ -28,7 +28,7 @@

Information

Information /> () constructor( readonly copyService: CopyService, @@ -30,19 +30,4 @@ export class AdditionalComponent { ) {} readonly url = this.route.snapshot.queryParamMap.get('url') || undefined - - presentModalMd(label: string) { - this.dialogs - .open(new PolymorpheusComponent(MarkdownComponent), { - label, - size: 'l', - data: { - content: this.marketplaceService.getStatic$( - this.pkg, - label === 'License' ? 'LICENSE.md' : 'instructions.md', - ), - }, - }) - .subscribe() - } } diff --git a/web/projects/marketplace/src/public-api.ts b/web/projects/marketplace/src/public-api.ts index 1a2a3e42d..d3b2582ce 100644 --- a/web/projects/marketplace/src/public-api.ts +++ b/web/projects/marketplace/src/public-api.ts @@ -29,7 +29,6 @@ export * from './components/menu/menu.component.module' export * from './components/menu/menu.component' export * from './components/registry.component' -export * from './services/marketplace.service' export * from './services/category.service' export * from './types' diff --git a/web/projects/marketplace/src/services/marketplace.service.ts b/web/projects/marketplace/src/services/marketplace.service.ts deleted file mode 100644 index 985105ed1..000000000 --- a/web/projects/marketplace/src/services/marketplace.service.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Observable } from 'rxjs' -import { MarketplacePkg, StoreData } from '../types' - -export abstract class AbstractMarketplaceService { - abstract getRegistry$(): Observable - - abstract getStatic$( - pkg: MarketplacePkg, - type: 'LICENSE.md' | 'instructions.md', - ): Observable -}