refactor config QA

This commit is contained in:
FrancescoMolinaro
2023-12-14 12:11:06 +01:00
parent 7fe81ec111
commit f2be578d2a
4 changed files with 5 additions and 12 deletions

View File

@@ -11,8 +11,7 @@ import {environment} from '../../../../environments/environment';
*/ */
@Injectable() @Injectable()
export class SourceDataResolver implements Resolve<Observable<QualityAssuranceSourceObject[]>> { export class SourceDataResolver implements Resolve<Observable<QualityAssuranceSourceObject[]>> {
private paginationStart = environment.qualityAssuranceConfig.defaultPaginationStart; private pageSize = environment.qualityAssuranceConfig.pageSize;
private paginationItemsCount = environment.qualityAssuranceConfig.defaultPaginationItemsCount;
/** /**
* Initialize the effect class variables. * Initialize the effect class variables.
* @param {QualityAssuranceSourceService} qualityAssuranceSourceService * @param {QualityAssuranceSourceService} qualityAssuranceSourceService
@@ -28,7 +27,7 @@ export class SourceDataResolver implements Resolve<Observable<QualityAssuranceSo
* @returns Observable<QualityAssuranceSourceObject[]> * @returns Observable<QualityAssuranceSourceObject[]>
*/ */
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<QualityAssuranceSourceObject[]> { resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<QualityAssuranceSourceObject[]> {
return this.qualityAssuranceSourceService.getSources(this.paginationItemsCount,this.paginationStart).pipe( return this.qualityAssuranceSourceService.getSources(this.pageSize, 0).pipe(
map((sources: PaginatedList<QualityAssuranceSourceObject>) => { map((sources: PaginatedList<QualityAssuranceSourceObject>) => {
if (sources.page.length === 1) { if (sources.page.length === 1) {
this.router.navigate([this.getResolvedUrl(route) + '/' + sources.page[0].id]); this.router.navigate([this.getResolvedUrl(route) + '/' + sources.page[0].id]);

View File

@@ -436,7 +436,6 @@ export class DefaultAppConfig implements AppConfig {
qualityAssuranceConfig: QualityAssuranceConfig = { qualityAssuranceConfig: QualityAssuranceConfig = {
openAireUrl: 'https://explore.openaire.eu/search/project?projectId=', openAireUrl: 'https://explore.openaire.eu/search/project?projectId=',
defaultPaginationItemsCount: 5, pageSize: 5,
defaultPaginationStart: 0
}; };
} }

View File

@@ -13,9 +13,5 @@ export class QualityAssuranceConfig implements Config {
/** /**
* default count of QA sources to load * default count of QA sources to load
*/ */
public defaultPaginationItemsCount: number; public pageSize: number;
/**
* default starting point of pagination
*/
public defaultPaginationStart: number;
} }

View File

@@ -308,8 +308,7 @@ export const environment: BuildConfig = {
}, },
qualityAssuranceConfig: { qualityAssuranceConfig: {
openAireUrl: 'https://explore.openaire.eu/search/project?projectId=', openAireUrl: 'https://explore.openaire.eu/search/project?projectId=',
defaultPaginationItemsCount: 5, pageSize: 5,
defaultPaginationStart: 0
}, },
vocabularies: [ vocabularies: [