Fixed styling errors

DSpace · Feb 23, 2024 · 1cea469 · 1cea469
1 parent e2bf9d2
commit 1cea469
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
@@ -52,15 +52,15 @@ export class FilteredCollectionsComponent {
   getFilteredCollections(): Observable<RawRestResponse> {
     let params = this.toQueryString();
     if (params.length > 0) {
-       params = "?" + params;
+       params = `?${params}`;
     }
     let scheme = environment.rest.ssl ? 'https' : 'http';
     let urlRestApp = `${scheme}://${environment.rest.host}:${environment.rest.port}${environment.rest.nameSpace}`;
     return this.restService.request(RestRequestMethod.GET, `${urlRestApp}/api/contentreport/filteredcollections${params}`);
   }
 
-  private toQueryString() : string {
-    let params = FiltersComponent.toQueryString(this.queryForm.value['filters']);
+  private toQueryString(): string {
+    let params = FiltersComponent.toQueryString(this.queryForm.value.filters);
     return params;
   }
 

diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
@@ -293,22 +293,22 @@ export class FilteredItemsComponent {
   getFilteredItems(): Observable<RawRestResponse> {
     let params = this.toQueryString();
     if (params.length > 0) {
-       params = "?" + params;
+       params = `?${params}`;
     }
     let scheme = environment.rest.ssl ? 'https' : 'http';
     let urlRestApp = `${scheme}://${environment.rest.host}:${environment.rest.port}${environment.rest.nameSpace}`;
     return this.restService.request(RestRequestMethod.GET, `${urlRestApp}/api/contentreport/filtereditems${params}`);
   }
 
-  private toQueryString() : string {
+  private toQueryString(): string {
     let params = `page=${this.currentPage}&size=${this.pageSize()}`;
 
-    let colls = this.queryForm.value['collections'];
+    let colls = this.queryForm.value.collections;
     for (const coll in colls) {
       params += `&collections=${colls[coll]}`;
     }
 
-    let preds = this.queryForm.value['queryPredicates'];
+    let preds = this.queryForm.value.queryPredicates;
     for (const pred in preds) {
       const field = preds[pred].field;
       const op = preds[pred].operator;
@@ -319,12 +319,12 @@ export class FilteredItemsComponent {
       }
     }
 
-    let filters = FiltersComponent.toQueryString(this.queryForm.value['filters']);
+    let filters = FiltersComponent.toQueryString(this.queryForm.value.filters);
     if (filters.length > 0) {
       params += `&${filters}`;
     }
 
-    let addFlds = this.queryForm.value['additionalFields'];
+    let addFlds = this.queryForm.value.additionalFields;
     for (const fld in addFlds) {
       params += `&additionalFields=${addFlds[fld]}`;
     }

diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.ts b/src/app/admin/admin-reports/filters-section/filters-section.component.ts
@@ -99,6 +99,22 @@ export class FiltersComponent {
     return undefined;
   }
 
+  static toQueryString(filters: Object): string {
+    let params = '';
+    let first = true;
+    for (const key in filters) {
+      if (filters[key]) {
+        if (first) {
+          first = false;
+        } else {
+          params += '&';
+        }
+        params += `filters=${key}`;
+      }
+    }
+    return params;
+  }
+
   allFilters(): FilterGroup[] {
     return FiltersComponent.FILTERS;
   }
@@ -126,20 +142,4 @@ export class FiltersComponent {
     this.setAllFilters(false);
   }
 
-  static toQueryString(filters: Object): string {
-    let params = '';
-    let first = true;
-    for (const key in filters) {
-      if (filters[key]) {
-        if (first) {
-          first = false;
-        } else {
-          params += '&';
-        }
-        params += `filters=${key}`;
-      }
-    }
-    return params;
-  }
-
 }