hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed styling errors

Browse Source
This commit is contained in:
Jean-François Morin
2024-02-23 16:49:48 -05:00
parent e2bf9d2bcf
commit 1cea4690da
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
View File

@@ -52,15 +52,15 @@ export class FilteredCollectionsComponent {
getFilteredCollections(): Observable<RawRestResponse> { getFilteredCollections(): Observable<RawRestResponse> {
let params = this.toQueryString(); let params = this.toQueryString();
if (params.length > 0) { if (params.length > 0) {
params = "?" + params; params = `?${params}`;
} }
let scheme = environment.rest.ssl ? 'https' : 'http'; let scheme = environment.rest.ssl ? 'https' : 'http';
let urlRestApp = `${scheme}://${environment.rest.host}:${environment.rest.port}${environment.rest.nameSpace}`; let urlRestApp = `${scheme}://${environment.rest.host}:${environment.rest.port}${environment.rest.nameSpace}`;
return this.restService.request(RestRequestMethod.GET, `${urlRestApp}/api/contentreport/filteredcollections${params}`); return this.restService.request(RestRequestMethod.GET, `${urlRestApp}/api/contentreport/filteredcollections${params}`);
} }
private toQueryString() : string { private toQueryString(): string {
let params = FiltersComponent.toQueryString(this.queryForm.value['filters']); let params = FiltersComponent.toQueryString(this.queryForm.value.filters);
return params; return params;
} }

12
src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
View File

@@ -293,22 +293,22 @@ export class FilteredItemsComponent {
getFilteredItems(): Observable<RawRestResponse> { getFilteredItems(): Observable<RawRestResponse> {
let params = this.toQueryString(); let params = this.toQueryString();
if (params.length > 0) { if (params.length > 0) {
params = "?" + params; params = `?${params}`;
} }
let scheme = environment.rest.ssl ? 'https' : 'http'; let scheme = environment.rest.ssl ? 'https' : 'http';
let urlRestApp = `${scheme}://${environment.rest.host}:${environment.rest.port}${environment.rest.nameSpace}`; let urlRestApp = `${scheme}://${environment.rest.host}:${environment.rest.port}${environment.rest.nameSpace}`;
return this.restService.request(RestRequestMethod.GET, `${urlRestApp}/api/contentreport/filtereditems${params}`); 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 params = `page=${this.currentPage}&size=${this.pageSize()}`;
let colls = this.queryForm.value['collections']; let colls = this.queryForm.value.collections;
for (const coll in colls) { for (const coll in colls) {
params += `&collections=${colls[coll]}`; params += `&collections=${colls[coll]}`;
} }
let preds = this.queryForm.value['queryPredicates']; let preds = this.queryForm.value.queryPredicates;
for (const pred in preds) { for (const pred in preds) {
const field = preds[pred].field; const field = preds[pred].field;
const op = preds[pred].operator; 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) { if (filters.length > 0) {
params += `&${filters}`; params += `&${filters}`;
} }
let addFlds = this.queryForm.value['additionalFields']; let addFlds = this.queryForm.value.additionalFields;
for (const fld in addFlds) { for (const fld in addFlds) {
params += `&additionalFields=${addFlds[fld]}`; params += `&additionalFields=${addFlds[fld]}`;
} }

32
src/app/admin/admin-reports/filters-section/filters-section.component.ts
View File

@@ -99,6 +99,22 @@ export class FiltersComponent {
return undefined; 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[] { allFilters(): FilterGroup[] {
return FiltersComponent.FILTERS; return FiltersComponent.FILTERS;
} }
@@ -126,20 +142,4 @@ export class FiltersComponent {
this.setAllFilters(false); 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;
}
} }