@studyportals/fawkes 3.0.1-3 → 4.0.0

package/README.md

@@ -1,17 +1,18 @@
-# fawkes
-
-This project is used to centralize indexability logic for our Search microservices and Sitemap Generator. The main purpose is to completely remove discrepancies between pages indexed by Search and page URLs stored in Sitemap.
-
-Link to documentation: https://studyportals.atlassian.net/wiki/x/BwAdvw
-
-## Base structure
-
-- organisations-seo (used by Organisation Search)
-- scholarships-seo (used by Scholarship Search)
-- sitemap-generator-seo (used by Sitemap Generator)
-- src
-    - common
-    - organisations
-    - scholarships
-    - sitemap-generator
-
+# fawkes
+
+This project is used to centralize indexability logic for our Search
+microservices and Sitemap Generator. The main purpose is to completely remove
+discrepancies between pages indexed by Search and page URLs stored in Sitemap.
+
+Link to documentation: https://studyportals.atlassian.net/wiki/x/BwAdvw
+
+## Base structure
+
+- organisations-seo (used by Organisation Search)
+- scholarships-seo (used by Scholarship Search)
+- sitemap-generator-seo (used by Sitemap Generator)
+- src
+  - common
+  - organisations
+  - scholarships
+  - sitemap-generator

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

@@ -1,3 +1,4 @@
-export * from "../src/common/ISeoInfoBase";
-export * from "../src/common/ISeoFilterState";
-export * from "../src/organisations";
+import { ISeoInfoBase } from '../src/common/ISeoInfoBase';
+import { ISeoFilterState } from '../src/common/ISeoFilterState';
+import { IOrganisationSearchApplicationState, SearchIndexabilityManager, ISeoSortingState, types } from '../src/organisations';
+export { ISeoInfoBase, ISeoFilterState, IOrganisationSearchApplicationState, SearchIndexabilityManager, ISeoSortingState, types };

package/dist/organisations-seo/index.js

@@ -1,3 +1,2 @@
-export * from "../src/common/ISeoInfoBase";
-export * from "../src/common/ISeoFilterState";
-export * from "../src/organisations";
+import { SearchIndexabilityManager, types } from '../src/organisations';
+export { SearchIndexabilityManager, types };

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

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

package/dist/scholarships-seo/index.js

@@ -1,3 +1,3 @@
-import { SearchIndexabilityManager } from "../src/scholarships/SearchIndexabilityManager";
-import { types } from "../src/scholarships/types";
+import { SearchIndexabilityManager } from '../src/scholarships/SearchIndexabilityManager';
+import { types } from '../src/scholarships/types';
 export { SearchIndexabilityManager, types };

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

@@ -1,7 +1,7 @@
-import { IOrganisationsClient } from "../src/sitemap-generator/IOrganisationsClient";
-import { IOrganisation } from "../src/sitemap-generator/IOrganisation";
-import { ISearchApiClient } from "../src/sitemap-generator/ISearchApiClient";
-import { ISitemapUrlGeneratorManager } from "../src/sitemap-generator/ISitemapUrlGeneratorManager";
-import { SitemapUrlGeneratorManager } from "../src/sitemap-generator/SitemapUrlGeneratorManager";
-import { FilterCombinations } from "../src/enums/FilterCombinations";
+import { IOrganisationsClient } from '../src/sitemap-generator/IOrganisationsClient';
+import { IOrganisation } from '../src/sitemap-generator/IOrganisation';
+import { ISearchApiClient } from '../src/sitemap-generator/ISearchApiClient';
+import { ISitemapUrlGeneratorManager } from '../src/sitemap-generator/ISitemapUrlGeneratorManager';
+import { SitemapUrlGeneratorManager } from '../src/sitemap-generator/SitemapUrlGeneratorManager';
+import { FilterCombinations } from '../src/enums/FilterCombinations';
 export { IOrganisationsClient, IOrganisation, ISearchApiClient, ISitemapUrlGeneratorManager, SitemapUrlGeneratorManager, FilterCombinations };

package/dist/sitemap-generator-seo/index.js

@@ -1,3 +1,3 @@
-import { SitemapUrlGeneratorManager } from "../src/sitemap-generator/SitemapUrlGeneratorManager";
-import { FilterCombinations } from "../src/enums/FilterCombinations";
+import { SitemapUrlGeneratorManager } from '../src/sitemap-generator/SitemapUrlGeneratorManager';
+import { FilterCombinations } from '../src/enums/FilterCombinations';
 export { SitemapUrlGeneratorManager, FilterCombinations };

package/dist/src/common/FilterKeyValuesMap.d.ts

@@ -1,2 +1,2 @@
-import { FilterKey } from "@studyportals/search-filters";
+import { FilterKey } from '@studyportals/search-filters';
 export type FilterKeyValuesMap = Map<FilterKey, string[]>;

package/dist/src/common/IDependencies.d.ts

@@ -1,4 +1,4 @@
-import { DependencyTypes } from "../enums/DependencyTypes";
+import { DependencyTypes } from '../enums/DependencyTypes';
 export interface IDependencies {
     dependencyType: DependencyTypes;
 }

package/dist/src/common/IRule.d.ts

@@ -1,5 +1,5 @@
-import { FilterKeyValuesMap } from "./FilterKeyValuesMap";
-import { ISearchDependencies } from "./ISearchDependencies";
+import { FilterKeyValuesMap } from './FilterKeyValuesMap';
+import { ISearchDependencies } from './ISearchDependencies';
 export interface IRule {
     getName(): string;
     forSearch(dependencies: ISearchDependencies): Promise<boolean>;

package/dist/src/common/ISearchDependencies.d.ts

@@ -1,5 +1,5 @@
-import { ISeoInfoBase, ISeoFilterState, ISearchApplicationState } from "../common";
-import { IDependencies } from "./IDependencies";
+import { ISeoInfoBase, ISeoFilterState, ISearchApplicationState } from '../common';
+import { IDependencies } from './IDependencies';
 export interface ISearchDependencies extends IDependencies {
     seoInfoBase: ISeoInfoBase;
     filterState: ISeoFilterState;

package/dist/src/common/ISeoDependencies.d.ts

@@ -1,3 +1,3 @@
-import { ISearchDependencies } from "../common/ISearchDependencies";
-import { ISitemapDependencies } from "../common/ISitemapDependencies";
+import { ISearchDependencies } from '../common/ISearchDependencies';
+import { ISitemapDependencies } from '../common/ISitemapDependencies';
 export type ISeoDependencies = ISearchDependencies | ISitemapDependencies;

package/dist/src/common/ISeoFilterState.d.ts

@@ -1,4 +1,4 @@
-import { FilterKey } from "@studyportals/search-filters";
+import { FilterKey } from '@studyportals/search-filters';
 export interface ISeoFilterState {
     getSelectedValuesFor(key: FilterKey): readonly string[];
     getSelectedFilters(): readonly FilterKey[];

package/dist/src/common/ISitemapDependencies.d.ts

@@ -1,6 +1,6 @@
-import { IDependencies } from "../common/IDependencies";
-import { ISearchApiClient } from "../sitemap-generator/ISearchApiClient";
-import { IOrganisationsClient } from "../sitemap-generator/IOrganisationsClient";
+import { IDependencies } from '../common/IDependencies';
+import { ISearchApiClient } from '../sitemap-generator/ISearchApiClient';
+import { IOrganisationsClient } from '../sitemap-generator/IOrganisationsClient';
 export interface ISitemapDependencies extends IDependencies {
     searchApiClient: ISearchApiClient;
     organisationsClient: IOrganisationsClient;

package/dist/src/common/ISitemapUrlGenerator.d.ts

@@ -1,4 +1,4 @@
-import { FilterCombinations } from "../enums/FilterCombinations";
+import { FilterCombinations } from '../enums/FilterCombinations';
 export interface ISitemapUrlGenerator {
     filterCombination: FilterCombinations;
     generateSitemapUrls(): Promise<string[]>;

package/dist/src/common/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./ISeoInfoBase";
-export * from "./ISeoFilterState";
-export * from "./ISearchApplicationState";
-export * from "./ISearchIndexabilityManager";
+export * from './ISeoInfoBase';
+export * from './ISeoFilterState';
+export * from './ISearchApplicationState';
+export * from './ISearchIndexabilityManager';

package/dist/src/common/index.js

@@ -1,4 +1,4 @@
-export * from "./ISeoInfoBase";
-export * from "./ISeoFilterState";
-export * from "./ISearchApplicationState";
-export * from "./ISearchIndexabilityManager";
+export * from './ISeoInfoBase';
+export * from './ISeoFilterState';
+export * from './ISearchApplicationState';
+export * from './ISearchIndexabilityManager';

package/dist/src/common/policies/BaseSeoIndexabilityPolicy.d.ts

@@ -1,15 +1,21 @@
-import { ISitemapUrlGenerator } from "../ISitemapUrlGenerator";
-import { ISeoIndexabilityPolicy } from "../ISeoIndexabilityPolicy";
-import { IDependencies } from "../IDependencies";
-import { FilterCombinations } from "../../enums/FilterCombinations";
+import { ISearchDependencies } from '../ISearchDependencies';
+import { IDependencies } from '../IDependencies';
+import { IRule } from '../IRule';
+import { FilterKeyValuesMap } from '../FilterKeyValuesMap';
+import { ISeoIndexabilityPolicy } from '../ISeoIndexabilityPolicy';
+import { ISitemapUrlGenerator } from '../ISitemapUrlGenerator';
+import { FilterCombinations } from '../../../sitemap-generator-seo';
 export declare abstract class BaseSeoIndexabilityPolicy<TDependencies extends IDependencies> implements ISeoIndexabilityPolicy, ISitemapUrlGenerator {
     protected readonly dependencies: TDependencies;
+    protected abstract readonly rules: IRule[];
     constructor(dependencies: TDependencies);
+    abstract get filterCombination(): FilterCombinations;
+    protected abstract generateUrls(): Promise<string[]>;
     shouldIndex(): Promise<boolean>;
     generateSitemapUrls(): Promise<string[]>;
+    protected isIndexable(): Promise<boolean>;
+    protected checkRulesForSearch(dependencies: ISearchDependencies): Promise<boolean>;
+    protected checkRulesForSitemap(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
     private isIndexabilityPolicyDependencies;
     private isSitemapUrlGeneratorDependencies;
-    protected abstract isIndexable(): Promise<boolean>;
-    protected abstract generateUrls(): Promise<string[]>;
-    abstract get filterCombination(): FilterCombinations;
 }

package/dist/src/common/policies/BaseSeoIndexabilityPolicy.js

@@ -1,5 +1,5 @@
-import { DependencyTypes } from "../../enums/DependencyTypes";
-import { InvalidDependencyTypeError } from "../../errors/InvalidDependencyTypeError";
+import { InvalidDependencyTypeError } from '../../errors/InvalidDependencyTypeError';
+import { DependencyTypes } from '../../enums/DependencyTypes';
 export class BaseSeoIndexabilityPolicy {
     dependencies;
     constructor(dependencies) {
@@ -17,6 +17,27 @@ export class BaseSeoIndexabilityPolicy {
         }
         return await this.generateUrls();
     }
+    async isIndexable() {
+        return await this.checkRulesForSearch(this.dependencies);
+    }
+    async checkRulesForSearch(dependencies) {
+        for (const rule of this.rules) {
+            const result = await rule.forSearch(dependencies);
+            if (!result) {
+                return false;
+            }
+        }
+        return true;
+    }
+    async checkRulesForSitemap(filterKeyValues) {
+        for (const rule of this.rules) {
+            const result = await rule.forSitemapGenerator(filterKeyValues);
+            if (!result) {
+                return false;
+            }
+        }
+        return true;
+    }
     isIndexabilityPolicyDependencies() {
         return this.dependencies.dependencyType === DependencyTypes.SEARCH;
     }

package/dist/src/common/rules/BaseFilterKeyValueRule.d.ts

@@ -1,6 +1,6 @@
-import { FilterKeyValuesMap } from "../FilterKeyValuesMap";
-import { IRule } from "../IRule";
-import { ISearchDependencies } from "../ISearchDependencies";
+import { FilterKeyValuesMap } from '../FilterKeyValuesMap';
+import { IRule } from '../IRule';
+import { ISearchDependencies } from '../ISearchDependencies';
 export declare abstract class BaseFilterKeyValueRule implements IRule {
     private readonly expectedFilterKeyValues;
     constructor(expectedFilterKeyValues: FilterKeyValuesMap);

package/dist/src/common/rules/BaseFilterKeyValueRule.js

@@ -5,12 +5,13 @@ export class BaseFilterKeyValueRule {
     }
     forSearch(dependencies) {
         const { seoInfoBase, filterState } = dependencies;
-        const result = Array.from(this.expectedFilterKeyValues)
-            .reduce((acc, [key, values]) => {
+        for (const [key, values] of this.expectedFilterKeyValues) {
             const optionValue = seoInfoBase.getFilterOptionValueBy(key, filterState);
-            return acc && optionValue === values[0];
-        }, true);
-        return Promise.resolve(result);
+            if (!optionValue || !values.includes(optionValue)) {
+                return Promise.resolve(false);
+            }
+        }
+        return Promise.resolve(true);
     }
     forSitemapGenerator(filterKeyValues) {
         for (const [key, values] of this.expectedFilterKeyValues) {

package/dist/src/common/rules/NoFiltersSelectedRule.d.ts

@@ -0,0 +1,8 @@
+import { IRule } from '../../common/IRule';
+import { FilterKeyValuesMap } from '../../common/FilterKeyValuesMap';
+import { ISearchDependencies } from '../ISearchDependencies';
+export declare class NoFiltersSelectedRule implements IRule {
+    forSearch(dependencies: ISearchDependencies): Promise<boolean>;
+    forSitemapGenerator(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
+    getName(): string;
+}

package/dist/src/{organisations → common}/rules/NoFiltersSelectedRule.js

@@ -4,11 +4,11 @@ export class NoFiltersSelectedRule {
         const selectionCount = seoInfoBase.getSelectionTypeCount(filterState);
         return Promise.resolve(selectionCount === 0);
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     forSitemapGenerator(filterKeyValues) {
-        throw new Error("Method not implemented.");
+        const filterKeys = Array.from(filterKeyValues.keys());
+        return Promise.resolve(filterKeys.length === 0);
     }
     getName() {
-        return "NoFiltersSelectedRule";
+        return 'NoFiltersSelectedRule';
     }
 }

package/dist/src/common/rules/OnlyFiltersSelectedRule.d.ts

@@ -1,7 +1,7 @@
-import { IRule } from "../../common/IRule";
-import { FilterKey } from "@studyportals/search-filters";
-import { ISearchDependencies } from "../../common/ISearchDependencies";
-import { FilterKeyValuesMap } from "../FilterKeyValuesMap";
+import { IRule } from '../../common/IRule';
+import { FilterKey } from '@studyportals/search-filters';
+import { ISearchDependencies } from '../../common/ISearchDependencies';
+import { FilterKeyValuesMap } from '../FilterKeyValuesMap';
 export declare class OnlyFiltersSelectedRule implements IRule {
     private readonly filterKeys;
     constructor(filterKeys: FilterKey[]);

package/dist/src/common/rules/OnlyFiltersSelectedRule.js

@@ -4,7 +4,7 @@ export class OnlyFiltersSelectedRule {
         this.filterKeys = filterKeys;
     }
     getName() {
-        return 'OneValueSelectedForFilterRule';
+        return `OnlyFiltersSelectedRule-${this.filterKeys.join('-')}`;
     }
     async forSearch(dependencies) {
         const seoInfoBase = dependencies.seoInfoBase;

package/dist/src/common/rules/SingleValueSelectedForFilterRule.d.ts

@@ -1,7 +1,7 @@
-import { IRule } from "../../common/IRule";
-import { FilterKey } from "@studyportals/search-filters";
-import { ISearchDependencies } from "../../common/ISearchDependencies";
-import { FilterKeyValuesMap } from "../FilterKeyValuesMap";
+import { IRule } from '../../common/IRule';
+import { FilterKey } from '@studyportals/search-filters';
+import { ISearchDependencies } from '../../common/ISearchDependencies';
+import { FilterKeyValuesMap } from '../FilterKeyValuesMap';
 export declare class SingleValueSelectedForFilterRule implements IRule {
     private readonly filterKey;
     constructor(filterKey: FilterKey);

package/dist/src/common/rules/SingleValueSelectedForFilterRule.js

@@ -4,7 +4,7 @@ export class SingleValueSelectedForFilterRule {
         this.filterKey = filterKey;
     }
     getName() {
-        return 'OneValueSelectedForFilterRule';
+        return `SingleValueSelectedForFilterRule-${this.filterKey}`;
     }
     async forSearch(dependencies) {
         const seoInfoBase = dependencies.seoInfoBase;

package/dist/src/enums/FilterCombinations.js

@@ -10,7 +10,6 @@ export var FilterCombinations;
     FilterCombinations["DISCIPLINE"] = "discipline";
     FilterCombinations["UNFILTERED"] = "unfiltered";
     FilterCombinations["UNIVERSITY_COUNTRY"] = "universityCountry";
-    // TODO: orgs
     FilterCombinations["ATTENDANCE_DISCIPLINE"] = "attendancedDiscipline";
     FilterCombinations["CONTINENT_ATTENDANCE"] = "continentAttendance";
     FilterCombinations["COUNTRY_ATTENDANCE"] = "countryAttendance";

package/dist/src/errors/InvalidFilterValueError.d.ts

@@ -1,4 +1,4 @@
-import { FilterKey } from "@studyportals/search-filters";
+import { FilterKey } from '@studyportals/search-filters';
 export declare class InvalidFilterValueError extends Error {
     constructor(filterKey: FilterKey, value: string | undefined);
 }

package/dist/src/organisations/IOrganisationSearchApplicationState.d.ts

@@ -1,4 +1,4 @@
-import { ISearchApplicationState } from "../common";
+import { ISearchApplicationState } from '../common';
 export interface IOrganisationSearchApplicationState extends ISearchApplicationState {
     getRankedResultsCount(): number;
 }

package/dist/src/organisations/ISeoSortingState.d.ts

@@ -1,4 +1,4 @@
-import { SortingOptions } from "../enums/SortingOptions";
+import { SortingOptions } from '../enums/SortingOptions';
 export interface ISeoSortingState {
     getSelectedOption(): SortingOptions;
 }

package/dist/src/organisations/SearchIndexabilityManager.d.ts

@@ -1,9 +1,9 @@
-import { ISearchIndexabilityManager } from "../common/ISearchIndexabilityManager";
-import { ISeoIndexabilityPolicy } from "../common/ISeoIndexabilityPolicy";
-import { IOrganisationSearchApplicationState } from "./IOrganisationSearchApplicationState";
-import { ISeoFilterState, ISeoInfoBase } from "../common";
-import { PortalType } from "@studyportals/domain-client";
-import { ISeoSortingState } from "../organisations/ISeoSortingState";
+import { ISearchIndexabilityManager } from '../common/ISearchIndexabilityManager';
+import { ISeoIndexabilityPolicy } from '../common/ISeoIndexabilityPolicy';
+import { IOrganisationSearchApplicationState } from './IOrganisationSearchApplicationState';
+import { ISeoFilterState, ISeoInfoBase } from '../common';
+import { PortalType } from '@studyportals/domain-client';
+import { ISeoSortingState } from '../organisations/ISeoSortingState';
 export declare class SearchIndexabilityManager implements ISearchIndexabilityManager {
     policies: ISeoIndexabilityPolicy[];
     constructor(portalType: PortalType, seoInfoBase: ISeoInfoBase, filterState: ISeoFilterState, sortingState: ISeoSortingState, applicationState: IOrganisationSearchApplicationState);

package/dist/src/organisations/SearchIndexabilityManager.js

@@ -1,5 +1,5 @@
-import { DependencyTypes } from "../enums/DependencyTypes";
-import { Area, AreaAttendance, Attendance, Continent, Country, CountryAttendance, Unfiltered, RankedArea, RankedAreaDiscipline, RankedAttendance, RankedAttendanceDiscipline, RankedContinent, RankedContinentAttendance, RankedCountry, RankedCountryAttendance, RankedCountryDiscipline, RankedDiscipline, RankedUnfiltered } from "../organisations/policies";
+import { DependencyTypes } from '../enums/DependencyTypes';
+import { Area, AreaAttendance, Attendance, Continent, Country, CountryAttendance, Unfiltered, RankedArea, RankedAreaDiscipline, RankedAttendance, RankedAttendanceDiscipline, RankedContinent, RankedContinentAttendance, RankedCountry, RankedCountryAttendance, RankedCountryDiscipline, RankedDiscipline, RankedUnfiltered } from '../organisations/policies';
 export class SearchIndexabilityManager {
     policies;
     constructor(portalType, seoInfoBase, filterState, sortingState, applicationState) {
@@ -33,7 +33,7 @@ export class SearchIndexabilityManager {
         ];
     }
     async shouldIndex() {
-        const results = await Promise.all(this.policies.map(policy => policy.shouldIndex()));
-        return results.some(result => result);
+        const results = await Promise.all(this.policies.map((policy) => policy.shouldIndex()));
+        return results.some((result) => result);
     }
 }

package/dist/src/organisations/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./IOrganisationSearchApplicationState";
-export * from "./ISeoSortingState";
-export * from "./SearchIndexabilityManager";
-export * from "./types";
+export * from './IOrganisationSearchApplicationState';
+export * from './ISeoSortingState';
+export * from './SearchIndexabilityManager';
+export * from './types';

package/dist/src/organisations/index.js

@@ -1,4 +1,4 @@
-export * from "./IOrganisationSearchApplicationState";
-export * from "./ISeoSortingState";
-export * from "./SearchIndexabilityManager";
-export * from "./types";
+export * from './IOrganisationSearchApplicationState';
+export * from './ISeoSortingState';
+export * from './SearchIndexabilityManager';
+export * from './types';

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

@@ -0,0 +1,11 @@
+import { PortalType } from '@studyportals/domain-client';
+import { BaseSeoIndexabilityPolicy } from '../../common/policies/BaseSeoIndexabilityPolicy';
+import { IOrganisationsSeoDependencies } from '../types/IOrganisationsSeoDependencies';
+import { SortingOptions } from '../../enums/SortingOptions';
+export declare abstract class OrganisationsSeoIndexabilityPolicy extends BaseSeoIndexabilityPolicy<IOrganisationsSeoDependencies> {
+    protected readonly indexablePortalTypes: PortalType[];
+    protected abstract readonly sortingOption: SortingOptions;
+    constructor(dependencies: IOrganisationsSeoDependencies);
+    protected isIndexable(): Promise<boolean>;
+    private matchesSortingOption;
+}

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

@@ -0,0 +1,19 @@
+import { PortalType } from '@studyportals/domain-client';
+import { BaseSeoIndexabilityPolicy } from '../../common/policies/BaseSeoIndexabilityPolicy';
+export class OrganisationsSeoIndexabilityPolicy extends BaseSeoIndexabilityPolicy {
+    indexablePortalTypes = [PortalType.MASTER];
+    constructor(dependencies) {
+        super(dependencies);
+    }
+    async isIndexable() {
+        const isIndexable = await super.isIndexable();
+        if (!isIndexable) {
+            return false;
+        }
+        return this.indexablePortalTypes.includes(this.dependencies.portalType) && this.matchesSortingOption();
+    }
+    matchesSortingOption() {
+        const dependencies = this.dependencies;
+        return dependencies.sortingState.getSelectedOption() === this.sortingOption;
+    }
+}

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

@@ -1,18 +1,18 @@
-export * from "./our-picks/Area";
-export * from "./our-picks/AreaAttendance";
-export * from "./our-picks/Attendance";
-export * from "./our-picks/Continent";
-export * from "./our-picks/Country";
-export * from "./our-picks/CountryAttendance";
-export * from "./our-picks/Unfiltered";
-export * from "./ranked/RankedArea";
-export * from "./ranked/RankedAreaDiscipline";
-export * from "./ranked/RankedAttendance";
-export * from "./ranked/RankedAttendanceDiscipline";
-export * from "./ranked/RankedContinent";
-export * from "./ranked/RankedContinentAttendance";
-export * from "./ranked/RankedCountry";
-export * from "./ranked/RankedCountryAttendance";
-export * from "./ranked/RankedCountryDiscipline";
-export * from "./ranked/RankedDiscipline";
-export * from "./ranked/RankedUnfiltered";
+export * from './our-picks/Area';
+export * from './our-picks/AreaAttendance';
+export * from './our-picks/Attendance';
+export * from './our-picks/Continent';
+export * from './our-picks/Country';
+export * from './our-picks/CountryAttendance';
+export * from './our-picks/Unfiltered';
+export * from './ranked/RankedArea';
+export * from './ranked/RankedAreaDiscipline';
+export * from './ranked/RankedAttendance';
+export * from './ranked/RankedAttendanceDiscipline';
+export * from './ranked/RankedContinent';
+export * from './ranked/RankedContinentAttendance';
+export * from './ranked/RankedCountry';
+export * from './ranked/RankedCountryAttendance';
+export * from './ranked/RankedCountryDiscipline';
+export * from './ranked/RankedDiscipline';
+export * from './ranked/RankedUnfiltered';

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

@@ -1,18 +1,18 @@
-export * from "./our-picks/Area";
-export * from "./our-picks/AreaAttendance";
-export * from "./our-picks/Attendance";
-export * from "./our-picks/Continent";
-export * from "./our-picks/Country";
-export * from "./our-picks/CountryAttendance";
-export * from "./our-picks/Unfiltered";
-export * from "./ranked/RankedArea";
-export * from "./ranked/RankedAreaDiscipline";
-export * from "./ranked/RankedAttendance";
-export * from "./ranked/RankedAttendanceDiscipline";
-export * from "./ranked/RankedContinent";
-export * from "./ranked/RankedContinentAttendance";
-export * from "./ranked/RankedCountry";
-export * from "./ranked/RankedCountryAttendance";
-export * from "./ranked/RankedCountryDiscipline";
-export * from "./ranked/RankedDiscipline";
-export * from "./ranked/RankedUnfiltered";
+export * from './our-picks/Area';
+export * from './our-picks/AreaAttendance';
+export * from './our-picks/Attendance';
+export * from './our-picks/Continent';
+export * from './our-picks/Country';
+export * from './our-picks/CountryAttendance';
+export * from './our-picks/Unfiltered';
+export * from './ranked/RankedArea';
+export * from './ranked/RankedAreaDiscipline';
+export * from './ranked/RankedAttendance';
+export * from './ranked/RankedAttendanceDiscipline';
+export * from './ranked/RankedContinent';
+export * from './ranked/RankedContinentAttendance';
+export * from './ranked/RankedCountry';
+export * from './ranked/RankedCountryAttendance';
+export * from './ranked/RankedCountryDiscipline';
+export * from './ranked/RankedDiscipline';
+export * from './ranked/RankedUnfiltered';

package/dist/src/organisations/policies/our-picks/Area.d.ts

@@ -1,9 +1,9 @@
-import { FilterCombinations } from "../../../enums/FilterCombinations";
-import { SortingOptions } from "../../../enums/SortingOptions";
-import { SingleValueSelectedForFilterRule } from "../../../common/rules/SingleValueSelectedForFilterRule";
-import { OrganisationsRuleBasedIndexabilityPolicy } from "../../../organisations/OrganisationsRuleBasedIndexabilityPolicy";
-import { OnlyFiltersSelectedRule } from "../../../common/rules/OnlyFiltersSelectedRule";
-export declare class Area extends OrganisationsRuleBasedIndexabilityPolicy {
+import { FilterCombinations } from '../../../enums/FilterCombinations';
+import { SortingOptions } from '../../../enums/SortingOptions';
+import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';
+import { OrganisationsSeoIndexabilityPolicy } from '../../../organisations/policies/OrganisationsSeoIndexabilityPolicy';
+import { OnlyFiltersSelectedRule } from '../../../common/rules/OnlyFiltersSelectedRule';
+export declare class Area extends OrganisationsSeoIndexabilityPolicy {
     protected readonly sortingOption = SortingOptions.OUR_PICKS;
     protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule)[];
     protected generateUrls(): Promise<string[]>;

package/dist/src/organisations/policies/our-picks/Area.js

@@ -1,10 +1,10 @@
-import { FilterCombinations } from "../../../enums/FilterCombinations";
-import { FilterKey } from "@studyportals/search-filters";
-import { SortingOptions } from "../../../enums/SortingOptions";
-import { SingleValueSelectedForFilterRule } from "../../../common/rules/SingleValueSelectedForFilterRule";
-import { OrganisationsRuleBasedIndexabilityPolicy } from "../../../organisations/OrganisationsRuleBasedIndexabilityPolicy";
-import { OnlyFiltersSelectedRule } from "../../../common/rules/OnlyFiltersSelectedRule";
-export class Area extends OrganisationsRuleBasedIndexabilityPolicy {
+import { FilterCombinations } from '../../../enums/FilterCombinations';
+import { FilterKey } from '@studyportals/search-filters';
+import { SortingOptions } from '../../../enums/SortingOptions';
+import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';
+import { OrganisationsSeoIndexabilityPolicy } from '../../../organisations/policies/OrganisationsSeoIndexabilityPolicy';
+import { OnlyFiltersSelectedRule } from '../../../common/rules/OnlyFiltersSelectedRule';
+export class Area extends OrganisationsSeoIndexabilityPolicy {
     sortingOption = SortingOptions.OUR_PICKS;
     rules = [
         new SingleValueSelectedForFilterRule(FilterKey.AREA),
@@ -12,7 +12,7 @@ export class Area extends OrganisationsRuleBasedIndexabilityPolicy {
         new OnlyFiltersSelectedRule([FilterKey.AREA, FilterKey.COUNTRY])
     ];
     async generateUrls() {
-        return [];
+        throw new Error('Method not implemented.');
     }
     get filterCombination() {
         return FilterCombinations.AREA;