@studyportals/fawkes 4.0.2-9 → 5.0.0

package/dist/scholarships-seo/index.d.ts

@@ -1,6 +1,4 @@
-import { ISeoFilterState } from '../src/common/ISeoFilterState';
-import { ISeoInfoBase } from '../src/common/ISeoInfoBase';
-import { ISearchIndexabilityManager } from '../src/common/ISearchIndexabilityManager';
+import { ISeoFilterState, ISearchApplicationState, ISearchIndexabilityManager, ISeoInfoBase } from '../src/common';
 import { SearchIndexabilityManager } from '../src/scholarships/SearchIndexabilityManager';
 import { types } from '../src/scholarships/types';
-export { ISeoFilterState, ISeoInfoBase, ISearchIndexabilityManager, SearchIndexabilityManager, types };
+export { ISeoFilterState, ISearchApplicationState, ISearchIndexabilityManager, ISeoInfoBase, SearchIndexabilityManager, types };

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/organisations/policies/OrganisationsSeoIndexabilityPolicy.js

@@ -1,6 +1,5 @@
 import { PortalType } from '@studyportals/domain-client';
 import { BaseSeoIndexabilityPolicy } from '../../common/policies/BaseSeoIndexabilityPolicy';
-import { SortingOptions } from '../../enums/SortingOptions';
 export class OrganisationsSeoIndexabilityPolicy extends BaseSeoIndexabilityPolicy {
     indexablePortalTypes = [PortalType.MASTER];
     constructor(dependencies) {
@@ -20,9 +19,6 @@ export class OrganisationsSeoIndexabilityPolicy extends BaseSeoIndexabilityPolic
         return this.indexablePortalTypes.includes(this.dependencies.portalType) && this.matchesSortingOption();
     }
     getPathWithSortingOption(path) {
-        if (this.sortingOption === SortingOptions.UNIVERSITY_META_RANKING) {
-            return 'rankings/' + path;
-        }
         return path;
     }
     matchesSortingOption() {

package/dist/src/organisations/policies/RankedOrganisationsSeoIndexabilityPolicy.d.ts

@@ -1,8 +1,7 @@
-import { PortalType } from '@studyportals/domain-client';
 import { SortingOptions } from '../../enums/SortingOptions';
 import { OrganisationsSeoIndexabilityPolicy } from './OrganisationsSeoIndexabilityPolicy';
 export declare abstract class RankedOrganisationsSeoIndexabilityPolicy extends OrganisationsSeoIndexabilityPolicy {
-    protected readonly indexablePortalTypes: PortalType[];
     protected readonly sortingOption: SortingOptions;
     protected addRankedResultsCountRule(): void;
+    protected getPathWithSortingOption(path: string): string;
 }

package/dist/src/organisations/policies/RankedOrganisationsSeoIndexabilityPolicy.js

@@ -1,9 +1,7 @@
-import { PortalType } from '@studyportals/domain-client';
 import { SortingOptions } from '../../enums/SortingOptions';
 import { OrganisationsSeoIndexabilityPolicy } from './OrganisationsSeoIndexabilityPolicy';
 import { AtLeastTwoRankedResultsRule } from '../rules/AtLeastTwoRankedResultsRule';
 export class RankedOrganisationsSeoIndexabilityPolicy extends OrganisationsSeoIndexabilityPolicy {
-    indexablePortalTypes = [PortalType.MASTER];
     sortingOption = SortingOptions.UNIVERSITY_META_RANKING;
     addRankedResultsCountRule() {
         let rankedResultsCountRule;
@@ -16,4 +14,7 @@ export class RankedOrganisationsSeoIndexabilityPolicy extends OrganisationsSeoIn
         }
         this.rules.push(rankedResultsCountRule);
     }
+    getPathWithSortingOption(path) {
+        return 'rankings/' + path;
+    }
 }

package/dist/src/scholarships/types.d.ts

@@ -1,6 +1,5 @@
 export declare const types: {
-    ISeoInfoBase: symbol;
-    ISeoFilterState: symbol;
-    ISeoSearchApplicationState: symbol;
-    SearchIndexabilityManager: symbol;
+    SeoInfoBase: symbol;
+    SeoFilterState: symbol;
+    SeoApplicationState: symbol;
 };

package/dist/src/scholarships/types.js

@@ -1,6 +1,5 @@
 export const types = {
-    ISeoInfoBase: Symbol.for('ISeoInfoBase'),
-    ISeoFilterState: Symbol.for('ISeoFilterState'),
-    ISeoSearchApplicationState: Symbol.for('ISeoSearchApplicationState'),
-    SearchIndexabilityManager: Symbol.for('SearchIndexabilityManager')
+    SeoInfoBase: Symbol.for('ISeoInfoBase'),
+    SeoFilterState: Symbol.for('ISeoFilterState'),
+    SeoApplicationState: Symbol.for('ISearchApplicationState')
 };

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

@@ -9,22 +9,13 @@ export class BaseSitemapUrlGeneratorManager {
             console.debug(`Generated ${urls.length} urls for policy: ${filterCombination}`); // eslint-disable-line no-console
             map.set(filterCombination, urls);
         }
-        // await Promise.all(
-        // 	this.policies.map(async (policy) => {
-        // 		console.debug(`Generating sitemap urls for policy: ${policy.filterCombination}`); // eslint-disable-line no-console
-        // 		const filterCombination = policy.filterCombination;
-        // 		const urls = await policy.generateSitemapUrls();
-        // 		console.debug(`Generated ${urls.length} urls for policy: ${filterCombination}`); // eslint-disable-line no-console
-        // 		map.set(filterCombination, urls);
-        // 	})
-        // );
         return map;
     }
     getFilterKeyValueCounts() {
         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/ISitemapUrlGeneratorManager.d.ts

@@ -1,6 +1,8 @@
 import { FilterCombinations } from '../enums/FilterCombinations';
+import { IPresenter } from '../common';
 import { FilterKey } from '@studyportals/search-filters';
 export interface ISitemapUrlGeneratorManager {
+    readonly presenters: Map<FilterKey, IPresenter>;
     generateUrls(): Promise<Map<FilterCombinations, string[]>>;
     getFilterKeyValueCounts(): Map<FilterKey, number>;
 }

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

@@ -6,16 +6,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;
@@ -46,6 +41,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-9",
+	"version": "5.0.0",
 	"description": "A package to centralize SEO related logic for SBLP and Sitemap Generator.",
 	"files": [
 		"./dist"