NAS-130884: fix data-source (#10726)

* fix data-source * add fields to avaiable app * NAS-130884: PR update --------- Co-authored-by: Alex Karpov <karpov4you@gmail.com>
truenas · Sep 23, 2024 · d2f61c1 · d2f61c1
1 parent 6c88559
commit d2f61c1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/app/interfaces/app.interface.ts b/src/app/interfaces/app.interface.ts
@@ -238,12 +238,12 @@ interface HostMount {
   hostPath: string;
 }
 
-interface Capability {
+export interface Capability {
   name: string;
   description: string;
 }
 
-interface AppRunAsContext {
+export interface AppRunAsContext {
   description: string;
   gid: number;
   group_name: string;

diff --git a/src/app/interfaces/available-app.interface.ts b/src/app/interfaces/available-app.interface.ts
@@ -1,5 +1,5 @@
 import { ApiTimestamp } from 'app/interfaces/api-date.interface';
-import { AppMetadata } from 'app/interfaces/app.interface';
+import { Capability, AppRunAsContext } from 'app/interfaces/app.interface';
 
 export interface AvailableApp {
   healthy: boolean;
@@ -9,7 +9,8 @@ export interface AvailableApp {
   title: string;
   description: string;
   app_readme: string;
-  app_metadata: AppMetadata;
+  capabilities: Capability[];
+  run_as_context: AppRunAsContext[];
   location: string;
   healthy_error: string;
   latest_version: string;

diff --git a/src/app/pages/apps/components/app-detail-view/app-detail-view.component.html b/src/app/pages/apps/components/app-detail-view/app-detail-view.component.html
@@ -68,14 +68,14 @@ <h2>{{ 'Screenshots' | translate }}</h2>
       <ix-app-json-details-card
         class="app-info-card"
         [title]="'Run As Context' | translate"
-        [jsonDetails]="app()?.app_metadata?.run_as_context"
+        [jsonDetails]="app().run_as_context"
         [isLoading]="isLoading()"
       ></ix-app-json-details-card>
 
       <ix-app-json-details-card
         class="app-info-card"
         [title]="'Capabilities' | translate"
-        [jsonDetails]="app()?.app_metadata?.capabilities"
+        [jsonDetails]="app().capabilities"
         [isLoading]="isLoading()"
       ></ix-app-json-details-card>
     </section>

diff --git a/...pps/components/app-detail-view/app-json-details-card/app-json-details-card.component.html b/...pps/components/app-detail-view/app-json-details-card/app-json-details-card.component.html
@@ -4,7 +4,7 @@ <h3>{{ title() | translate }}</h3>
   <div class="app-list-item">
     <ngx-skeleton-loader></ngx-skeleton-loader>
   </div>
-} @else if (jsonDetails()) {
+} @else if (jsonDetails()?.length > 0) {
   @for (item of jsonDetails(); track item) {
     <div class="app-list-wrapper">
       @for(key of getKeys(item); track key) {