diff --git a/ui/src/app/pages/apps-routes/app-available-show/app-available-show.page.ts b/ui/src/app/pages/apps-routes/app-available-show/app-available-show.page.ts index 591c4f421..cb7c3337a 100644 --- a/ui/src/app/pages/apps-routes/app-available-show/app-available-show.page.ts +++ b/ui/src/app/pages/apps-routes/app-available-show/app-available-show.page.ts @@ -12,6 +12,7 @@ import { pauseFor } from 'src/app/util/misc.util' import { AvailableShow } from 'src/app/services/api/api-types' import { PatchDbModel } from 'src/app/models/patch-db/patch-db-model' import { PackageState } from 'src/app/models/patch-db/data-model' +import { ReleaseNoteModel } from '../app-release-notes-list/release-notes' @Component({ selector: 'app-available-show', @@ -41,6 +42,7 @@ export class AppAvailableShowPage { private readonly popoverController: PopoverController, private readonly emver: Emver, public readonly patch: PatchDbModel, + public releaseNotesModel: ReleaseNoteModel, ) { } async ngOnInit () { @@ -53,6 +55,7 @@ export class AppAvailableShowPage { this.loading = true try { this.pkg = await this.apiService.getAvailableShow({ id: this.pkgId, version }) + this.releaseNotesModel.releaseNotes = this.pkg['release-notes'] } catch (e) { console.error(e) this.error = e.message diff --git a/ui/src/app/pages/apps-routes/app-release-notes-list/app-release-notes-list.page.html b/ui/src/app/pages/apps-routes/app-release-notes-list/app-release-notes-list.page.html index 3f28d142c..98500e73b 100644 --- a/ui/src/app/pages/apps-routes/app-release-notes-list/app-release-notes-list.page.html +++ b/ui/src/app/pages/apps-routes/app-release-notes-list/app-release-notes-list.page.html @@ -8,10 +8,10 @@ - + -
+

{{note.key | displayEmver}}

diff --git a/ui/src/app/pages/apps-routes/app-release-notes-list/app-release-notes-list.page.ts b/ui/src/app/pages/apps-routes/app-release-notes-list/app-release-notes-list.page.ts index 54de4f8c6..a6eabac7d 100644 --- a/ui/src/app/pages/apps-routes/app-release-notes-list/app-release-notes-list.page.ts +++ b/ui/src/app/pages/apps-routes/app-release-notes-list/app-release-notes-list.page.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core' import { ActivatedRoute } from '@angular/router' -import { AvailableShow } from 'src/app/services/api/api-types' import { ApiService } from 'src/app/services/api/api.service' +import { ReleaseNoteModel } from './release-notes' @Component({ selector: 'app-release-notes-list', @@ -9,32 +9,34 @@ import { ApiService } from 'src/app/services/api/api.service' styleUrls: ['./app-release-notes-list.page.scss'], }) export class AppReleaseNotesListPage { - loading = true error = '' pkgId: string - pkg: AvailableShow + releaseNotes: { [version: string]: string} selected: string constructor ( private readonly route: ActivatedRoute, private readonly apiService: ApiService, - - ) { } + private releaseNoteModel: ReleaseNoteModel, + ) { + console.log('model model', releaseNoteModel.releaseNotes) + this.releaseNotes = releaseNoteModel.releaseNotes + } ngOnInit () { this.pkgId = this.route.snapshot.paramMap.get('pkgId') - this.getPkg() + if (!this.releaseNotes) { + this.getReleaseNotes() + } } - async getPkg (version?: string): Promise { - this.loading = true + async getReleaseNotes (version?: string): Promise { try { - this.pkg = await this.apiService.getAvailableShow({ id: this.pkgId, version }) + const pkg = await this.apiService.getAvailableShow({ id: this.pkgId, version }) + this.releaseNotes = pkg['release-notes'] } catch (e) { console.error(e) this.error = e.message - } finally { - this.loading = false } } diff --git a/ui/src/app/pages/apps-routes/app-release-notes-list/release-notes.ts b/ui/src/app/pages/apps-routes/app-release-notes-list/release-notes.ts new file mode 100644 index 000000000..520829faf --- /dev/null +++ b/ui/src/app/pages/apps-routes/app-release-notes-list/release-notes.ts @@ -0,0 +1,12 @@ +import { Injectable } from '@angular/core' + +@Injectable({ + providedIn: 'root', +}) +export class ReleaseNoteModel { + releaseNotes: { [version: string]: string} + + constructor () { } +} + +