Merge pull request #1050 from SciCatProject/SWAP-3160-scicat-fe-inves…

…tigate-and-test-files-section

fix: files page does not render data

src/app/files/files-dashboard/files-dashboard.component.html

@@ -1,2 +1,2 @@
-<shared-table [dataSource]="dataSource" [columnsdef]="columns" [pageSize]="5" (rowClick)="onRowClick($event)">
+<shared-table [dataSource]="dataSource" [isFilesDashboard]="true" [columnsdef]="columns" [pageSize]="5" (rowClick)="onRowClick($event)">
 </shared-table>

src/app/shared/modules/shared-table/shared-table.component.spec.ts

@@ -119,7 +119,8 @@ describe("SharedTableComponent", () => {
         component.sort.active,
         component.sort.direction,
         component.paginator.pageIndex,
-        component.paginator.pageSize
+        component.paginator.pageSize,
+        component.isFilesDashboard
       );
     });
   });

src/app/shared/modules/shared-table/shared-table.component.ts

@@ -75,6 +75,7 @@ export class SharedTableComponent
 
   // Shared Variables
   @Input() dataSource: SciCatDataSource;
+  @Input() isFilesDashboard: boolean;
   @Input() columnsdef: Column[];
   @Input() pageSize = 10;
   @Input() pageSizeOptions: number[] = [5, 10, 25, 100];
@@ -216,7 +217,8 @@ export class SharedTableComponent
       this.sort.active,
       this.sort.direction,
       this.paginator.pageIndex,
-      this.paginator.pageSize
+      this.paginator.pageSize,
+      this.isFilesDashboard
     );
   }
 

src/app/shared/services/scicat-data-service.ts

@@ -116,7 +116,8 @@ export class ScicatDataService {
     sortField?: string,
     sortOrder = "asc",
     pageNumber = 0,
-    pageSize = 10
+    pageSize = 10,
+    isFilesDashboard = false
   ): Observable<any[]> {
     // Dataset filter syntax (not used here)
     // {"limit":3,"skip":11,"where":{"ownerGroup":"p16633"},"order":"size ASC"}
@@ -150,7 +151,11 @@ export class ScicatDataService {
       .set("fields", JSON.stringify(filterFields))
       .set("limits", JSON.stringify(limits))
       .append("access_token", this.auth.getToken().id);
-    return this.http.get<any[]>(`${url}/fullquery`, {
+
+
+    const origDatablocksFiles = url.includes("Origdatablocks") && isFilesDashboard ? "/files" : "";
+
+    return this.http.get<any[]>(`${url}/fullquery${origDatablocksFiles}`, {
       params,
       headers: { Authorization: this.auth.getAccessTokenId() },
     });

src/app/shared/services/scicat.datasource.ts

@@ -69,7 +69,8 @@ export class SciCatDataSource implements DataSource<any> {
     sortField?: string,
     sortDirection = "asc",
     pageIndex = 0,
-    pageSize = 10
+    pageSize = 10,
+    isFilesDashboard?: boolean,
   ) {
     this.loadingSubject.next(true);
 
@@ -89,7 +90,8 @@ export class SciCatDataSource implements DataSource<any> {
         sortField,
         sortDirection,
         pageIndex,
-        pageSize
+        pageSize,
+        isFilesDashboard
       )
       .pipe(
         catchError(() => of([])),