@studyportals/fawkes 4.0.2-15 → 4.0.2-17

package/dist/sitemap-generator-seo/index.d.ts

@@ -7,4 +7,5 @@ import { OrganisationsSitemapUrlGeneratorManager } from '../src/sitemap-generato
 import { ScholarshipsSitemapUrlGeneratorManager } from '../src/sitemap-generator/ScholarshipsSitemapUrlGeneratorManager';
 import { FilterCombinations } from '../src/enums/FilterCombinations';
 import { FilterKeyValuesMap } from '../src/common/FilterKeyValuesMap';
-export { IOrganisationsClient, IOrganisation, IRankingApiClient, ISearchApiClient, ISitemapUrlGeneratorManager, OrganisationsSitemapUrlGeneratorManager, ScholarshipsSitemapUrlGeneratorManager, FilterCombinations, FilterKeyValuesMap };
+import { IPresenter } from '../src/common';
+export { IOrganisationsClient, IOrganisation, IRankingApiClient, ISearchApiClient, ISitemapUrlGeneratorManager, OrganisationsSitemapUrlGeneratorManager, ScholarshipsSitemapUrlGeneratorManager, FilterCombinations, FilterKeyValuesMap, IPresenter };

package/dist/src/sitemap-generator/BaseSitemapUrlGeneratorManager.d.ts

@@ -5,7 +5,7 @@ import { IPresenter } from '../common';
 import { FilterKey } from '@studyportals/search-filters';
 export declare abstract class BaseSitemapUrlGeneratorManager implements ISitemapUrlGeneratorManager {
     abstract readonly policies: ISitemapUrlGenerator[];
-    protected abstract readonly presenters: IPresenter[];
+    abstract readonly presenters: Map<FilterKey, IPresenter>;
     protected readonly filterKeyValueCounts: Map<FilterKey, number>;
     generateUrls(): Promise<Map<FilterCombinations, string[]>>;
     getFilterKeyValueCounts(): Map<FilterKey, number>;

package/dist/src/sitemap-generator/BaseSitemapUrlGeneratorManager.js

@@ -24,7 +24,7 @@ export class BaseSitemapUrlGeneratorManager {
         return this.filterKeyValueCounts;
     }
     setFilterKeyValueCounts() {
-        for (const presenter of this.presenters) {
+        for (const presenter of this.presenters.values()) {
             const count = presenter.getFragments().length;
             this.filterKeyValueCounts.set(presenter.filterKey, count);
         }

package/dist/src/sitemap-generator/OrganisationsSitemapUrlGeneratorManager.d.ts

@@ -4,14 +4,11 @@ import { ISearchApiClient } from '../sitemap-generator/ISearchApiClient';
 import { BaseSitemapUrlGeneratorManager } from './BaseSitemapUrlGeneratorManager';
 import { PortalType } from '@studyportals/domain-client';
 import { IRankingApiClient } from './IRankingApiClient';
-import { AreaPresenter } from '../presenters/AreaPresenter';
-import { AttendancePresenter } from '../presenters/AttendancePresenter';
-import { ContinentPresenter } from '../presenters/ContinentPresenter';
-import { CountryPresenter } from '../presenters/CountryPresenter';
-import { DisciplinePresenter } from '../presenters/DisciplinePresenter';
+import { FilterKey } from '@studyportals/search-filters';
+import { IPresenter } from '../common';
 export declare class OrganisationsSitemapUrlGeneratorManager extends BaseSitemapUrlGeneratorManager {
     readonly portalType: PortalType;
     readonly policies: ISitemapUrlGenerator[];
-    protected readonly presenters: (AreaPresenter | AttendancePresenter | ContinentPresenter | CountryPresenter | DisciplinePresenter)[];
+    readonly presenters: Map<FilterKey, IPresenter>;
     constructor(portalType: PortalType, searchApiClient: ISearchApiClient, organisationsClient: IOrganisationsClient, rankingApiClient: IRankingApiClient);
 }

package/dist/src/sitemap-generator/OrganisationsSitemapUrlGeneratorManager.js

@@ -7,16 +7,11 @@ import { AttendancePresenter } from '../presenters/AttendancePresenter';
 import { ContinentPresenter } from '../presenters/ContinentPresenter';
 import { CountryPresenter } from '../presenters/CountryPresenter';
 import { DisciplinePresenter } from '../presenters/DisciplinePresenter';
+import { FilterKey } from '@studyportals/search-filters';
 export class OrganisationsSitemapUrlGeneratorManager extends BaseSitemapUrlGeneratorManager {
     portalType;
     policies;
-    presenters = [
-        AreaPresenter.getInstance(),
-        AttendancePresenter.getInstance(),
-        ContinentPresenter.getInstance(),
-        CountryPresenter.getInstance(),
-        DisciplinePresenter.getInstance()
-    ];
+    presenters = new Map();
     constructor(portalType, searchApiClient, organisationsClient, rankingApiClient) {
         super();
         this.portalType = portalType;
@@ -47,6 +42,11 @@ export class OrganisationsSitemapUrlGeneratorManager extends BaseSitemapUrlGener
             // new RankedDiscipline(dependencies),
             // new RankedUnfiltered(dependencies)
         ];
+        this.presenters.set(FilterKey.AREA, AreaPresenter.getInstance());
+        this.presenters.set(FilterKey.DELIVERY_METHOD, AttendancePresenter.getInstance());
+        this.presenters.set(FilterKey.CONTINENT, ContinentPresenter.getInstance());
+        this.presenters.set(FilterKey.COUNTRY, CountryPresenter.getInstance());
+        this.presenters.set(FilterKey.DISCIPLINES, DisciplinePresenter.getInstance());
         this.setFilterKeyValueCounts();
     }
 }

package/dist/src/sitemap-generator/ScholarshipsSitemapUrlGeneratorManager.d.ts

@@ -4,6 +4,6 @@ import { ISearchApiClient } from '../sitemap-generator/ISearchApiClient';
 import { BaseSitemapUrlGeneratorManager } from './BaseSitemapUrlGeneratorManager';
 export declare class ScholarshipsSitemapUrlGeneratorManager extends BaseSitemapUrlGeneratorManager {
     readonly policies: ISitemapUrlGenerator[];
-    protected readonly presenters: never[];
+    readonly presenters: Map<any, any>;
     constructor(searchApiClient: ISearchApiClient, organisationsClient: IOrganisationsClient);
 }

package/dist/src/sitemap-generator/ScholarshipsSitemapUrlGeneratorManager.js

@@ -8,7 +8,7 @@ import { Unfiltered } from '../scholarships/policies/Unfiltered';
 import { BaseSitemapUrlGeneratorManager } from './BaseSitemapUrlGeneratorManager';
 export class ScholarshipsSitemapUrlGeneratorManager extends BaseSitemapUrlGeneratorManager {
     policies;
-    presenters = [];
+    presenters = new Map();
     constructor(searchApiClient, organisationsClient) {
         super();
         const dependencies = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@studyportals/fawkes",
-	"version": "4.0.2-15",
+	"version": "4.0.2-17",
 	"description": "A package to centralize SEO related logic for SBLP and Sitemap Generator.",
 	"files": [
 		"./dist"