Merge branch 'develop' into uniform-deployment-scripts

SciCatProject · Feb 8, 2023 · 8c9c4f3 · 8c9c4f3
2 parents 7d6daf9 + d2fe3c9
commit 8c9c4f3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts
@@ -40,12 +40,14 @@ export class DashboardComponent {
     { name: "creator", icon: "group", sort: true, inList: true },
     { name: "doi", icon: "label", sort: true, inList: true },
   ];
+  itemFields = {thumbnail: false};
 
   params: any = this.datasourceService.queryParams(
     this.itemsPerPage,
     this.currentPage,
     this.sortColumn,
-    this.sortDirection
+    this.sortDirection,
+    this.itemFields,
   );
   publications$: Observable<
     PublishedData[]
@@ -72,7 +74,8 @@ export class DashboardComponent {
       this.itemsPerPage,
       this.currentPage,
       this.sortColumn,
-      this.sortDirection
+      this.sortDirection,
+      this.itemFields,
     );
     this.publications$ = this.datasourceService.getPublications(this.params);
   }
@@ -85,7 +88,8 @@ export class DashboardComponent {
       this.itemsPerPage,
       this.currentPage,
       this.sortColumn,
-      this.sortDirection
+      this.sortDirection,
+      this.itemFields,
     );
     this.publications$ = this.datasourceService.getPublications(this.params);
   }

diff --git a/src/app/datasource.service.ts b/src/app/datasource.service.ts
@@ -36,13 +36,15 @@ export class DatasourceService {
     itemsPerPage: number,
     currentPage: number,
     sortColumn: string,
-    sortDirection: string
+    sortDirection: string,
+    itemFields: Partial<{[key in keyof PublishedData]: boolean}>
   ): string {
     return this.appConfig.directMongoAccess
       ? JSON.stringify({
           order: sortColumn + " " + sortDirection,
           skip: itemsPerPage * currentPage,
           limit: itemsPerPage,
+          fields: itemFields,
         })
       : "(" +
           "skip=" +
@@ -53,6 +55,8 @@ export class DatasourceService {
           sortColumn +
           ",sortDirection=" +
           sortDirection +
+          ",excludeFields=" +
+          Object.keys(itemFields).filter(k => !itemFields[k]).join("|") +
           ")";
   }
 }