diff --git a/src/app/pages/apps/components/app-detail-view/app-available-info-card/app-available-info-card.component.html b/src/app/pages/apps/components/app-detail-view/app-available-info-card/app-available-info-card.component.html index fdd389330f5..15c7779b8df 100644 --- a/src/app/pages/apps/components/app-detail-view/app-available-info-card/app-available-info-card.component.html +++ b/src/app/pages/apps/components/app-detail-view/app-available-info-card/app-available-info-card.component.html @@ -5,7 +5,7 @@

{{ 'Application Info' | translate }}

@if (isLoading$() | async) { } @else { - {{ app()?.latest_app_version | orNotAvailable }} + {{ app()?.latest_version | orNotAvailable }} }
diff --git a/src/app/pages/apps/components/app-detail-view/app-available-info-card/app-available-info-card.component.spec.ts b/src/app/pages/apps/components/app-detail-view/app-available-info-card/app-available-info-card.component.spec.ts index 77e2b84e334..8d35c611c34 100644 --- a/src/app/pages/apps/components/app-detail-view/app-available-info-card/app-available-info-card.component.spec.ts +++ b/src/app/pages/apps/components/app-detail-view/app-available-info-card/app-available-info-card.component.spec.ts @@ -52,7 +52,7 @@ describe('AppAvailableInfoCardComponent', () => { }); it('shows card details', () => { - expect(spectator.queryAll('.app-list-item')[0]).toHaveText('Version: 2023.5.3'); + expect(spectator.queryAll('.app-list-item')[0]).toHaveText('Version: 1.0.9'); expect(spectator.queryAll('.app-list-item')[1]).toHaveText('Source:github.com/home-assistant/home-assistant'); expect(spectator.queryAll('.app-list-item')[2]).toHaveText('Last App Update: 05/15/2023'); diff --git a/src/app/pages/apps/components/app-detail-view/app-details-header/app-details-header.component.html b/src/app/pages/apps/components/app-detail-view/app-details-header/app-details-header.component.html index 07cd9e6ce7b..da2d0c6b15c 100644 --- a/src/app/pages/apps/components/app-detail-view/app-details-header/app-details-header.component.html +++ b/src/app/pages/apps/components/app-detail-view/app-details-header/app-details-header.component.html @@ -49,6 +49,14 @@ {{ app?.latest_app_version | orNotAvailable }} }
+
+ {{ 'Version' | translate }}: + @if (isLoading$ | async) { + + } @else { + {{ app?.latest_version | orNotAvailable }} + } +
{{ 'Keywords' | translate }}: @if (isLoading$ | async) { diff --git a/src/app/pages/apps/components/app-detail-view/app-details-header/app-details-header.component.spec.ts b/src/app/pages/apps/components/app-detail-view/app-details-header/app-details-header.component.spec.ts index 93bf961063a..510ad8f24f5 100644 --- a/src/app/pages/apps/components/app-detail-view/app-details-header/app-details-header.component.spec.ts +++ b/src/app/pages/apps/components/app-detail-view/app-details-header/app-details-header.component.spec.ts @@ -30,7 +30,8 @@ describe('AppDetailsHeaderComponent', () => { const application = { icon_url: 'http://github.com/truenas/icon.png', name: 'SETI@home', - latest_app_version: '1.0.0', + latest_app_version: '1.0.5', + latest_version: '1.0.0', tags: ['aliens', 'ufo'], train: 'stable', home: 'https://www.seti.org', @@ -153,19 +154,23 @@ describe('AppDetailsHeaderComponent', () => { describe('other elements', () => { it('shows app version', () => { - expect(spectator.queryAll('.app-list-item')[0]).toHaveText('App Version: 1.0.0'); + expect(spectator.queryAll('.app-list-item')[0]).toHaveText('App Version: 1.0.5'); + }); + + it('shows version', () => { + expect(spectator.queryAll('.app-list-item')[1]).toHaveText('Version: 1.0.0'); }); it('shows app keywords', () => { - expect(spectator.queryAll('.app-list-item')[1]).toHaveText('Keywords: aliens, ufo'); + expect(spectator.queryAll('.app-list-item')[2]).toHaveText('Keywords: aliens, ufo'); }); it('shows app train', () => { - expect(spectator.queryAll('.app-list-item')[2]).toHaveText('Train: stable'); + expect(spectator.queryAll('.app-list-item')[3]).toHaveText('Train: stable'); }); it('shows app homepage', () => { - expect(spectator.queryAll('.app-list-item')[3]).toHaveText('Homepage:seti.org'); + expect(spectator.queryAll('.app-list-item')[4]).toHaveText('Homepage:seti.org'); }); it('shows app description', () => { diff --git a/src/app/pages/apps/components/installed-apps/app-info-card/app-info-card.component.html b/src/app/pages/apps/components/installed-apps/app-info-card/app-info-card.component.html index 68fd8d7abdd..2b718b38943 100644 --- a/src/app/pages/apps/components/installed-apps/app-info-card/app-info-card.component.html +++ b/src/app/pages/apps/components/installed-apps/app-info-card/app-info-card.component.html @@ -49,6 +49,14 @@

}

+
+
{{ 'Version' | translate }}:
+
+ @if (!isCustomApp()) { + {{ app()?.version | orNotAvailable }} + } +
+
{{ 'Source' | translate }}:
diff --git a/src/app/pages/apps/components/installed-apps/app-info-card/app-info-card.component.spec.ts b/src/app/pages/apps/components/installed-apps/app-info-card/app-info-card.component.spec.ts index 127632cb785..5a87395a15c 100644 --- a/src/app/pages/apps/components/installed-apps/app-info-card/app-info-card.component.spec.ts +++ b/src/app/pages/apps/components/installed-apps/app-info-card/app-info-card.component.spec.ts @@ -35,13 +35,13 @@ describe('AppInfoCardComponent', () => { name: 'test-user-app-name', human_version: '1.2.3_3.2.1', upgrade_available: true, + version: '1.2.3', metadata: { name: 'ix-test-app', icon: '', sources: [ 'http://github.com/ix-test-app/ix-test-app/', ], - version: '1.2.3', app_version: '3.2.1', train: 'stable', }, @@ -135,6 +135,10 @@ describe('AppInfoCardComponent', () => { label: 'App Version:', value: '3.2.1', }, + { + label: 'Version:', + value: '1.2.3', + }, { label: 'Source:', value: 'github.com/ix-test-app/ix-test-app',