-
Notifications
You must be signed in to change notification settings - Fork 309
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
NAS-130469 / 24.10 / Various app fixes (#10407)
* NAS-130469: Various app fixes * NAS-130469: Various app fixes * NAS-130469: Various app fixes
- Loading branch information
Showing
135 changed files
with
561 additions
and
718 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| export interface AppDetailsRouteParams { appId: string; catalog: string; train: string } | ||
| export interface AppDetailsRouteParams { appId: string; train: string } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
105 changes: 105 additions & 0 deletions
105
src/app/pages/apps/components/app-detail-view/app-detail-view.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| import { HarnessLoader } from '@angular/cdk/testing'; | ||
| import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; | ||
| import { MatButtonHarness } from '@angular/material/button/testing'; | ||
| import { Router } from '@angular/router'; | ||
| import { createRoutingFactory, mockProvider, Spectator } from '@ngneat/spectator/jest'; | ||
| import { MockComponents, MockModule } from 'ng-mocks'; | ||
| import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; | ||
| import { of } from 'rxjs'; | ||
| import { mockCall, mockJob, mockWebSocket } from 'app/core/testing/utils/mock-websocket.utils'; | ||
| import { AvailableApp } from 'app/interfaces/available-app.interface'; | ||
| import { CatalogApp } from 'app/interfaces/catalog.interface'; | ||
| import { App } from 'app/interfaces/chart-release.interface'; | ||
| import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; | ||
| import { OrNotAvailablePipe } from 'app/modules/pipes/or-not-available/or-not-available.pipe'; | ||
| import { AppCardLogoComponent } from 'app/pages/apps/components/app-card-logo/app-card-logo.component'; | ||
| import { | ||
| AppAvailableInfoCardComponent, | ||
| } from 'app/pages/apps/components/app-detail-view/app-available-info-card/app-available-info-card.component'; | ||
| import { AppDetailViewComponent } from 'app/pages/apps/components/app-detail-view/app-detail-view.component'; | ||
| import { | ||
| AppDetailsHeaderComponent, | ||
| } from 'app/pages/apps/components/app-detail-view/app-details-header/app-details-header.component'; | ||
| import { | ||
| AppDetailsSimilarComponent, | ||
| } from 'app/pages/apps/components/app-detail-view/app-details-similar/app-details-similar.component'; | ||
| import { | ||
| AppResourcesCardComponent, | ||
| } from 'app/pages/apps/components/app-detail-view/app-resources-card/app-resources-card.component'; | ||
| import { AppsStore } from 'app/pages/apps/store/apps-store.service'; | ||
| import { DockerStore } from 'app/pages/apps/store/docker.service'; | ||
| import { InstalledAppsStore } from 'app/pages/apps/store/installed-apps-store.service'; | ||
| import { AuthService } from 'app/services/auth/auth.service'; | ||
|
|
||
| const appsResponse = [{ | ||
| name: 'webdav', | ||
| catalog: 'TRUENAS', | ||
| train: 'community', | ||
| description: 'webdav', | ||
| app_readme: '<h1>WebDAV</h1>\n<p> When application ...</p>', | ||
| last_update: { $date: 452 }, | ||
| }] as AvailableApp[]; | ||
|
|
||
| const existingCatalogApp = { | ||
| name: 'webdav', | ||
| versions: { | ||
| ['1.0.9' as string]: {}, | ||
| }, | ||
| latest_version: '1.0.9', | ||
| } as CatalogApp; | ||
|
|
||
| describe('AppDetailViewComponent', () => { | ||
| let spectator: Spectator<AppDetailViewComponent>; | ||
| let loader: HarnessLoader; | ||
|
|
||
| const createComponent = createRoutingFactory({ | ||
| component: AppDetailViewComponent, | ||
| imports: [ | ||
| NgxSkeletonLoaderModule, | ||
| MockModule(PageHeaderModule), | ||
| OrNotAvailablePipe, | ||
| ], | ||
| declarations: [ | ||
| AppDetailsHeaderComponent, | ||
| MockComponents( | ||
| AppResourcesCardComponent, | ||
| AppAvailableInfoCardComponent, | ||
| AppCardLogoComponent, | ||
| AppDetailsSimilarComponent, | ||
| ), | ||
| ], | ||
| providers: [ | ||
| InstalledAppsStore, | ||
| mockWebSocket([ | ||
| mockJob('app.create'), | ||
| mockJob('app.update'), | ||
| mockCall('catalog.get_app_details', existingCatalogApp), | ||
| mockCall('app.query', [{} as App]), | ||
| mockCall('service.started', true), | ||
| ]), | ||
| mockProvider(AuthService, { | ||
| user$: of({ attributes: { appsAgreement: true } }), | ||
| hasRole: () => of(true), | ||
| }), | ||
| mockProvider(AppsStore, { | ||
| availableApps$: of(appsResponse), | ||
| isLoading$: of(false), | ||
| }), | ||
| mockProvider(DockerStore, { | ||
| selectedPool$: of('pool'), | ||
| }), | ||
| ], | ||
| params: { appId: 'webdav', catalog: 'TRUENAS', train: 'community' }, | ||
| }); | ||
|
|
||
| beforeEach(() => { | ||
| spectator = createComponent(); | ||
| loader = TestbedHarnessEnvironment.loader(spectator.fixture); | ||
| }); | ||
|
|
||
| it('redirect to install app when Install button is pressed', async () => { | ||
| const saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Install' })); | ||
| await saveButton.click(); | ||
| expect(spectator.inject(Router).navigate).toHaveBeenCalledWith(['/apps', 'available', 'community', 'webdav', 'install']); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 21 additions & 22 deletions
43
...es/apps/components/app-detail-view/app-details-similar/app-details-similar.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,22 @@ | ||
| <ng-container> | ||
| <h2>{{ 'Similar Apps' | translate }}</h2> | ||
| <h2>{{ 'Similar Apps' | translate }}</h2> | ||
|
|
||
| @if (similarAppsLoading$ | async) { | ||
| <div fxLayout="row wrap" fxLayoutGap="16px"> | ||
| <ngx-skeleton-loader class="similar-app-loader" fxFlex></ngx-skeleton-loader> | ||
| <ngx-skeleton-loader class="similar-app-loader" fxFlex></ngx-skeleton-loader> | ||
| </div> | ||
| } @else if (similarApps.length) { | ||
| <div class="similar-apps"> | ||
| @for (app of similarApps; track trackByAppId($index, app)) { | ||
| <ix-app-card | ||
| [app]="app" | ||
| [routerLink]="['/apps', 'available', app.catalog, app.train, app.name]" | ||
| (keyup.enter)="router.navigate(['/apps', 'available', app.catalog, app.train, app.name])" | ||
| ></ix-app-card> | ||
| } | ||
| </div> | ||
| } @else { | ||
| <h4 class="no-similar">{{ 'No similar apps found.' | translate }}</h4> | ||
| } | ||
|
|
||
| </ng-container> | ||
| @if (isLoading()) { | ||
| <div fxLayout="row wrap" fxLayoutGap="16px"> | ||
| <ngx-skeleton-loader class="similar-app-loader" fxFlex></ngx-skeleton-loader> | ||
| <ngx-skeleton-loader class="similar-app-loader" fxFlex></ngx-skeleton-loader> | ||
| </div> | ||
| } @else if (loadingError()) { | ||
| <h4 class="no-similar">{{ 'Error when loading similar apps.' | translate }}</h4> | ||
| } @else if (similarApps().length) { | ||
| <div class="similar-apps"> | ||
| @for (app of similarApps(); track trackByAppId($index, app)) { | ||
| <ix-app-card | ||
| [app]="app" | ||
| [routerLink]="['/apps', 'available', app.train, app.name]" | ||
| (keyup.enter)="router.navigate(['/apps', 'available', app.train, app.name])" | ||
| ></ix-app-card> | ||
| } | ||
| </div> | ||
| } @else { | ||
| <h4 class="no-similar">{{ 'No similar apps found.' | translate }}</h4> | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.