diff --git a/ui/src/app/modals/app-release-notes/app-release-notes.page.html b/ui/src/app/modals/app-release-notes/app-release-notes.page.html index 58f75a2e0..5094ff4f9 100644 --- a/ui/src/app/modals/app-release-notes/app-release-notes.page.html +++ b/ui/src/app/modals/app-release-notes/app-release-notes.page.html @@ -5,7 +5,7 @@ - {{ version }} Release Notes + {{ version | displayEmver }} Release Notes diff --git a/ui/src/app/pages/apps-routes/app-available-show/app-available-show.page.html b/ui/src/app/pages/apps-routes/app-available-show/app-available-show.page.html index 5614030ae..7c812f47b 100644 --- a/ui/src/app/pages/apps-routes/app-available-show/app-available-show.page.html +++ b/ui/src/app/pages/apps-routes/app-available-show/app-available-show.page.html @@ -81,10 +81,11 @@ - Release Notes - - - New in {{ vars.versionViewing | displayEmver }} + New in {{ vars.versionViewing | displayEmver }} + + +
+
diff --git a/ui/src/app/pages/apps-routes/app-available-show/app-available-show.page.scss b/ui/src/app/pages/apps-routes/app-available-show/app-available-show.page.scss index fa9c4aab5..20dc5bd27 100644 --- a/ui/src/app/pages/apps-routes/app-available-show/app-available-show.page.scss +++ b/ui/src/app/pages/apps-routes/app-available-show/app-available-show.page.scss @@ -1,22 +1,7 @@ -// .recommendation-container { -// margin-top: 3px; -// display: grid; -// grid-template-columns: auto auto; -// justify-content: start; -// grid-column-gap: 5px; -// align-items: center; -// } - .recommendation-text { font-style: italic; } -// @media (min-width:1000px) { -// .recommendation-text { -// font-size: small; -// } -// } - .recommendation-error { color: var(--ion-color-danger); } @@ -31,4 +16,9 @@ font-size: medium; padding-left: 10px; font-weight: unset; +} + +#release-notes { + overflow: auto; + max-height: 160px; } \ No newline at end of file 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 74c3ca7f5..ae37680eb 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 @@ -4,8 +4,8 @@ import { AppAvailableFull, AppAvailableVersionSpecificInfo } from 'src/app/model import { ApiService } from 'src/app/services/api/api.service' import { AlertController, ModalController, NavController, PopoverController } from '@ionic/angular' import { markAsLoadingDuring$ } from 'src/app/services/loader.service' -import { BehaviorSubject, from, Observable, of } from 'rxjs' -import { catchError, concatMap, filter, switchMap, tap } from 'rxjs/operators' +import { BehaviorSubject, combineLatest, from, merge, Observable, of } from 'rxjs' +import { catchError, concatMap, delay, filter, skip, switchMap, tap } from 'rxjs/operators' import { Recommendation } from 'src/app/components/recommendation-button/recommendation-button.component' import { wizardModal } from 'src/app/components/install-wizard/install-wizard.component' import { WizardBaker } from 'src/app/components/install-wizard/prebaked-wizards' @@ -39,8 +39,6 @@ export class AppAvailableShowPage extends Cleanup { serviceDependencyDefintion = 'Service Dependencies are other services that this service recommends or requires in order to run.' - showMoreReleaseNotes = false - constructor ( private readonly route: ActivatedRoute, private readonly apiService: ApiService,