refactor config QA

DSpace · Dec 14, 2023 · f2be578 · f2be578
1 parent 7fe81ec
commit f2be578
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/...n-quality-assurance-source-page-component/admin-quality-assurance-source-data.resolver.ts b/...n-quality-assurance-source-page-component/admin-quality-assurance-source-data.resolver.ts
@@ -11,8 +11,7 @@ import {environment} from '../../../../environments/environment';
  */
 @Injectable()
 export class SourceDataResolver implements Resolve<Observable<QualityAssuranceSourceObject[]>> {
-  private paginationStart = environment.qualityAssuranceConfig.defaultPaginationStart;
-  private  paginationItemsCount = environment.qualityAssuranceConfig.defaultPaginationItemsCount;
+  private  pageSize = environment.qualityAssuranceConfig.pageSize;
   /**
    * Initialize the effect class variables.
    * @param {QualityAssuranceSourceService} qualityAssuranceSourceService
@@ -28,7 +27,7 @@ export class SourceDataResolver implements Resolve<Observable<QualityAssuranceSo
    * @returns 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>) => {
           if (sources.page.length === 1) {
              this.router.navigate([this.getResolvedUrl(route) + '/' + sources.page[0].id]);

diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
@@ -436,7 +436,6 @@ export class DefaultAppConfig implements AppConfig {
 
   qualityAssuranceConfig: QualityAssuranceConfig = {
     openAireUrl: 'https://explore.openaire.eu/search/project?projectId=',
-    defaultPaginationItemsCount: 5,
-    defaultPaginationStart: 0
+    pageSize: 5,
   };
 }
diff --git a/src/config/quality-assurance.config.ts b/src/config/quality-assurance.config.ts
@@ -13,9 +13,5 @@ export class QualityAssuranceConfig implements Config {
   /**
    * default count of QA sources to load
    */
-  public defaultPaginationItemsCount: number;
-  /**
-   * default starting point of pagination
-   */
-  public defaultPaginationStart: number;
+  public pageSize: number;
 }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
@@ -308,8 +308,7 @@ export const environment: BuildConfig = {
   },
   qualityAssuranceConfig: {
     openAireUrl: 'https://explore.openaire.eu/search/project?projectId=',
-    defaultPaginationItemsCount: 5,
-    defaultPaginationStart: 0
+    pageSize: 5,
   },
 
   vocabularies: [