@studyportals/fawkes 7.4.2-4 → 8.0.1-1

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

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

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

@@ -1,5 +1,5 @@
 import { IFragment } from '../presenters/fragments/IFragment';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 export interface IPresenter {
     readonly filterKey: FilterKey;
     getFragments(): IFragment[];

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

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

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

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { ISeoFilterState } from './ISeoFilterState';
 export interface ISeoInfoBase {
     selectionOnlyFor(filterKeys: FilterKey[], filterSelectionState: ISeoFilterState): Promise<boolean>;

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

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { BaseFilterKeyValueRule } from '../../common/rules/BaseFilterKeyValueRule';
 export class OnlineAttendanceRule extends BaseFilterKeyValueRule {
     constructor() {

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

@@ -1,5 +1,5 @@
 import { IRule } from '../../common/IRule';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { ISearchDependencies } from '../../common/ISearchDependencies';
 import { FilterKeyValuesMap } from '../FilterKeyValuesMap';
 export declare class OnlyFiltersSelectedRule implements IRule {

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

@@ -1,5 +1,5 @@
 import { IRule } from '../../common/IRule';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { ISearchDependencies } from '../../common/ISearchDependencies';
 import { FilterKeyValuesMap } from '../FilterKeyValuesMap';
 export declare class SingleValueSelectedForFilterRule implements IRule {

package/dist/src/enums/FilterCombinations.d.ts

@@ -4,7 +4,6 @@ export declare enum FilterCombinations {
     AREA_DISCIPLINE = "areaDiscipline",
     COUNTRY = "country",
     DEGREE = "degree",
-    DURATION = "duration",
     COUNTRY_DEGREE = "countryDegree",
     COUNTRY_DURATION = "countryDuration",
     COUNTRY_FORMAT = "countryFormat",
@@ -12,8 +11,6 @@ export declare enum FilterCombinations {
     COUNTRY_EDUCATIONAL_FORM = "countryEducationalForm",
     COUNTRY_ATTENDANCE_DEGREE = "countryAttendanceDegree",
     COUNTRY_DURATION_DEGREE = "countryDurationDegree",
-    COUNTRY_SPECIAL_PROGRAMMES = "countrySpecialProgrammes",
-    CONTINENT_FORMAT = "continentFormat",
     DISCIPLINE_AREA = "disciplineArea",
     DISCIPLINE_ATTENDANCE = "disciplineAttendance",
     DISCIPLINE_COUNTRY = "disciplineCountry",
@@ -25,34 +22,16 @@ export declare enum FilterCombinations {
     DISCIPLINE_EDUCATIONAL_FORM = "disciplineEducationalForm",
     DISCIPLINE_TUITION_FEE_ATTENDANCE = "disciplineTuitionFeeAttendance",
     DISCIPLINE_COUNTRY_EDUCATIONAL_FORM = "disciplineCountryEducationalForm",
-    DISCIPLINE_CONTINENT_ATTENDANCE = "disciplineContinentAttendance",
-    DISCIPLINE_SPECIAL_PROGRAMMES = "disciplineSpecialProgrammes",
-    DISCIPLINE_COUNTRY_ATTENDANCE = "disciplineCountryAttendance",
     DEGREE_COUNTRY_DISCIPLINE = "degreeCountryDiscipline",
     DEGREE_ATTENDANCE_DISCIPLINE = "degreeAttendanceDiscipline",
     DEGREE_COUNTRY_TUITION_FEE = "degreeCountryTuitionFee",
     DEGREE_COUNTRY_ATTENDANCE = "degreeCountryAttendance",
-    DEGREE_TUITION_FEE = "degreeTuitionFee",
-    DEGREE_ATTENDANCE_TUITION_FEE = "degreeAttendanceTuitionFee",
-    DEGREE_ATTENDANCE_FORMAT = "degreeAttendanceFormat",
-    DEGREE_AREA = "degreeArea",
-    DEGREE_FORMAT = "degreeFormat",
-    DEGREE_CONTINENT = "degreeContinent",
-    DEGREE_AREA_TUITION_FEE = "degreeAreaTuitionFee",
-    DEGREE_CONTINENT_TUITION_FEE = "degreeContinentTuitionFee",
-    DEGREE_DURATION = "degreeDuration",
-    DEGREE_FORMAT_TUITION_FEE = "degreeFormatTuitionFee",
-    DEGREE_SPECIAL_PROGRAMMES = "degreeSpecialProgrammes",
     DISCIPLINE = "discipline",
     UNFILTERED = "unfiltered",
     UNIVERSITY_COUNTRY = "universityCountry",
     ATTENDANCE_DISCIPLINE = "attendancedDiscipline",
     ATTENDANCE_DEGREE = "attendanceDegree",
-    ATTENDANCE_TUITION_FEE = "attendanceTuitionFee",
-    ATTENDANCE_DURATION = "attendanceDuration",
-    ATTENDANCE_FORMAT = "attendanceFormat",
-    ATTENDANCE_AREA = "attendanceArea",
-    ATTENDANCE_CONTINENT = "attendanceContinent",
+    CONTINENT_ATTENDANCE = "continentAttendance",
     COUNTRY_ATTENDANCE = "countryAttendance",
     ATTENDANCE = "attendance",
     CONTINENT = "continent",

package/dist/src/enums/FilterCombinations.js

@@ -5,7 +5,6 @@ export var FilterCombinations;
     FilterCombinations["AREA_DISCIPLINE"] = "areaDiscipline";
     FilterCombinations["COUNTRY"] = "country";
     FilterCombinations["DEGREE"] = "degree";
-    FilterCombinations["DURATION"] = "duration";
     FilterCombinations["COUNTRY_DEGREE"] = "countryDegree";
     FilterCombinations["COUNTRY_DURATION"] = "countryDuration";
     FilterCombinations["COUNTRY_FORMAT"] = "countryFormat";
@@ -13,8 +12,6 @@ export var FilterCombinations;
     FilterCombinations["COUNTRY_EDUCATIONAL_FORM"] = "countryEducationalForm";
     FilterCombinations["COUNTRY_ATTENDANCE_DEGREE"] = "countryAttendanceDegree";
     FilterCombinations["COUNTRY_DURATION_DEGREE"] = "countryDurationDegree";
-    FilterCombinations["COUNTRY_SPECIAL_PROGRAMMES"] = "countrySpecialProgrammes";
-    FilterCombinations["CONTINENT_FORMAT"] = "continentFormat";
     FilterCombinations["DISCIPLINE_AREA"] = "disciplineArea";
     FilterCombinations["DISCIPLINE_ATTENDANCE"] = "disciplineAttendance";
     FilterCombinations["DISCIPLINE_COUNTRY"] = "disciplineCountry";
@@ -26,34 +23,16 @@ export var FilterCombinations;
     FilterCombinations["DISCIPLINE_EDUCATIONAL_FORM"] = "disciplineEducationalForm";
     FilterCombinations["DISCIPLINE_TUITION_FEE_ATTENDANCE"] = "disciplineTuitionFeeAttendance";
     FilterCombinations["DISCIPLINE_COUNTRY_EDUCATIONAL_FORM"] = "disciplineCountryEducationalForm";
-    FilterCombinations["DISCIPLINE_CONTINENT_ATTENDANCE"] = "disciplineContinentAttendance";
-    FilterCombinations["DISCIPLINE_SPECIAL_PROGRAMMES"] = "disciplineSpecialProgrammes";
-    FilterCombinations["DISCIPLINE_COUNTRY_ATTENDANCE"] = "disciplineCountryAttendance";
     FilterCombinations["DEGREE_COUNTRY_DISCIPLINE"] = "degreeCountryDiscipline";
     FilterCombinations["DEGREE_ATTENDANCE_DISCIPLINE"] = "degreeAttendanceDiscipline";
     FilterCombinations["DEGREE_COUNTRY_TUITION_FEE"] = "degreeCountryTuitionFee";
     FilterCombinations["DEGREE_COUNTRY_ATTENDANCE"] = "degreeCountryAttendance";
-    FilterCombinations["DEGREE_TUITION_FEE"] = "degreeTuitionFee";
-    FilterCombinations["DEGREE_ATTENDANCE_TUITION_FEE"] = "degreeAttendanceTuitionFee";
-    FilterCombinations["DEGREE_ATTENDANCE_FORMAT"] = "degreeAttendanceFormat";
-    FilterCombinations["DEGREE_AREA"] = "degreeArea";
-    FilterCombinations["DEGREE_FORMAT"] = "degreeFormat";
-    FilterCombinations["DEGREE_CONTINENT"] = "degreeContinent";
-    FilterCombinations["DEGREE_AREA_TUITION_FEE"] = "degreeAreaTuitionFee";
-    FilterCombinations["DEGREE_CONTINENT_TUITION_FEE"] = "degreeContinentTuitionFee";
-    FilterCombinations["DEGREE_DURATION"] = "degreeDuration";
-    FilterCombinations["DEGREE_FORMAT_TUITION_FEE"] = "degreeFormatTuitionFee";
-    FilterCombinations["DEGREE_SPECIAL_PROGRAMMES"] = "degreeSpecialProgrammes";
     FilterCombinations["DISCIPLINE"] = "discipline";
     FilterCombinations["UNFILTERED"] = "unfiltered";
     FilterCombinations["UNIVERSITY_COUNTRY"] = "universityCountry";
     FilterCombinations["ATTENDANCE_DISCIPLINE"] = "attendancedDiscipline";
     FilterCombinations["ATTENDANCE_DEGREE"] = "attendanceDegree";
-    FilterCombinations["ATTENDANCE_TUITION_FEE"] = "attendanceTuitionFee";
-    FilterCombinations["ATTENDANCE_DURATION"] = "attendanceDuration";
-    FilterCombinations["ATTENDANCE_FORMAT"] = "attendanceFormat";
-    FilterCombinations["ATTENDANCE_AREA"] = "attendanceArea";
-    FilterCombinations["ATTENDANCE_CONTINENT"] = "attendanceContinent";
+    FilterCombinations["CONTINENT_ATTENDANCE"] = "continentAttendance";
     FilterCombinations["COUNTRY_ATTENDANCE"] = "countryAttendance";
     FilterCombinations["ATTENDANCE"] = "attendance";
     FilterCombinations["CONTINENT"] = "continent";

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

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

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

@@ -8,10 +8,12 @@ export declare abstract class OrganisationsSeoIndexabilityPolicy extends BaseSeo
     protected abstract readonly sortingOption: SortingOptions;
     protected abstract readonly baseRules: IRule[];
     private additionalRules;
+    constructor(dependencies: IOrganisationsSeoDependencies);
     protected get rules(): IRule[];
     protected addRule(rule: IRule): void;
     generateSitemapUrls(): Promise<string[]>;
     protected isIndexable(): Promise<boolean>;
+    protected addResultsCountRule(): void;
     protected getPathWithSortingOption(path: string): string;
     private matchesSortingOption;
 }

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

@@ -1,9 +1,14 @@
 import { PortalType } from '@studyportals/domain-client';
 import { BaseSeoIndexabilityPolicy } from '../../common/policies/BaseSeoIndexabilityPolicy';
 import { IndexablePageNumberRule } from '../../common/rules/IndexablePageNumberRule';
+import { AtLeastSevenResultsRule } from '../../organisations/rules/AtLeastSevenResultsRule';
 export class OrganisationsSeoIndexabilityPolicy extends BaseSeoIndexabilityPolicy {
     indexablePortalTypes = [PortalType.MASTER];
     additionalRules = [];
+    constructor(dependencies) {
+        super(dependencies);
+        this.addResultsCountRule();
+    }
     get rules() {
         return [...this.baseRules, ...this.additionalRules, new IndexablePageNumberRule()];
     }
@@ -23,6 +28,17 @@ export class OrganisationsSeoIndexabilityPolicy extends BaseSeoIndexabilityPolic
         }
         return this.indexablePortalTypes.includes(this.dependencies.portalType) && this.matchesSortingOption();
     }
+    addResultsCountRule() {
+        let resultCountRUle;
+        if (super.isSitemapUrlGeneratorDependencies()) {
+            const dependencies = this.dependencies;
+            resultCountRUle = new AtLeastSevenResultsRule(dependencies.searchApiClient);
+        }
+        else {
+            resultCountRUle = new AtLeastSevenResultsRule();
+        }
+        this.addRule(resultCountRUle);
+    }
     getPathWithSortingOption(path) {
         return path;
     }

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

@@ -4,6 +4,6 @@ import { OrganisationsSeoIndexabilityPolicy } from './OrganisationsSeoIndexabili
 export declare abstract class RankedOrganisationsSeoIndexabilityPolicy extends OrganisationsSeoIndexabilityPolicy {
     protected readonly indexablePortalTypes: PortalType[];
     protected readonly sortingOption: SortingOptions;
-    protected addRankedResultsCountRule(): void;
+    protected addResultsCountRule(): void;
     protected getPathWithSortingOption(path: string): string;
 }

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

@@ -5,7 +5,7 @@ import { AtLeastTwoRankedResultsRule } from '../rules/AtLeastTwoRankedResultsRul
 export class RankedOrganisationsSeoIndexabilityPolicy extends OrganisationsSeoIndexabilityPolicy {
     indexablePortalTypes = [PortalType.MASTER];
     sortingOption = SortingOptions.UNIVERSITY_META_RANKING;
-    addRankedResultsCountRule() {
+    addResultsCountRule() {
         let rankedResultsCountRule;
         if (super.isSitemapUrlGeneratorDependencies()) {
             const dependencies = this.dependencies;

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

@@ -1,5 +1,5 @@
 import { FilterCombinations } from '../../../enums/FilterCombinations';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { SortingOptions } from '../../../enums/SortingOptions';
 import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';
 import { OrganisationsSeoIndexabilityPolicy } from '../../../organisations/policies/OrganisationsSeoIndexabilityPolicy';

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

@@ -1,6 +1,6 @@
 import { OrganisationsSeoIndexabilityPolicy } from '../../../organisations/policies/OrganisationsSeoIndexabilityPolicy';
 import { FilterCombinations } from '../../../enums/FilterCombinations';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { SearchVolumeAreasAttendanceRule } from '../../../organisations/rules/SearchVolumeAreasAttendanceRule';
 import { SortingOptions } from '../../../enums/SortingOptions';
 import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';

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

@@ -1,5 +1,5 @@
 import { FilterCombinations } from '../../../enums/FilterCombinations';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { SortingOptions } from '../../../enums/SortingOptions';
 import { OrganisationsSeoIndexabilityPolicy } from '../../../organisations/policies/OrganisationsSeoIndexabilityPolicy';
 import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';

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

@@ -1,5 +1,5 @@
 import { FilterCombinations } from '../../../enums/FilterCombinations';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { SortingOptions } from '../../../enums/SortingOptions';
 import { OrganisationsSeoIndexabilityPolicy } from '../../../organisations/policies/OrganisationsSeoIndexabilityPolicy';
 import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';

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

@@ -1,5 +1,5 @@
 import { FilterCombinations } from '../../../enums/FilterCombinations';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { SortingOptions } from '../../../enums/SortingOptions';
 import { OrganisationsSeoIndexabilityPolicy } from '../../../organisations/policies/OrganisationsSeoIndexabilityPolicy';
 import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';

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

@@ -1,5 +1,5 @@
 import { FilterCombinations } from '../../../enums/FilterCombinations';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { SortingOptions } from '../../../enums/SortingOptions';
 import { OrganisationsSeoIndexabilityPolicy } from '../../../organisations/policies/OrganisationsSeoIndexabilityPolicy';
 import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';

package/dist/src/organisations/policies/ranked/RankedArea.js

@@ -1,5 +1,5 @@
 import { FilterCombinations } from '../../../enums/FilterCombinations';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';
 import { OnlyFiltersSelectedRule } from '../../../common/rules/OnlyFiltersSelectedRule';
 import { AreaPresenter } from '../../../presenters/AreaPresenter';
@@ -14,7 +14,6 @@ export class RankedArea extends RankedOrganisationsSeoIndexabilityPolicy {
     ];
     constructor(dependencies) {
         super(dependencies);
-        this.addRankedResultsCountRule();
     }
     async generateUrls() {
         const areaFragments = AreaPresenter.getInstance().getFragments();

package/dist/src/organisations/policies/ranked/RankedAreaDiscipline.js

@@ -1,6 +1,6 @@
 import { SearchVolumeAreasDisciplineRule } from '../../../organisations/rules/SearchVolumeAreasDisciplineRule';
 import { FilterCombinations } from '../../../enums/FilterCombinations';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';
 import { OnlyFiltersSelectedRule } from '../../../common/rules/OnlyFiltersSelectedRule';
 import { AreaPresenter } from '../../../presenters/AreaPresenter';
@@ -18,7 +18,6 @@ export class RankedAreaDiscipline extends RankedOrganisationsSeoIndexabilityPoli
     ];
     constructor(dependencies) {
         super(dependencies);
-        this.addRankedResultsCountRule();
     }
     get filterCombination() {
         return FilterCombinations.RANKED_AREA_DISCIPLINE;

package/dist/src/organisations/policies/ranked/RankedAttendance.js

@@ -1,6 +1,6 @@
 import { OnlineAttendanceRule } from '../../../common/rules/OnlineAttendanceRule';
 import { FilterCombinations } from '../../../enums/FilterCombinations';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';
 import { OnlyFiltersSelectedRule } from '../../../common/rules/OnlyFiltersSelectedRule';
 import { AttendancePresenter } from '../../../presenters/AttendancePresenter';
@@ -15,7 +15,6 @@ export class RankedAttendance extends RankedOrganisationsSeoIndexabilityPolicy {
     ];
     constructor(dependencies) {
         super(dependencies);
-        this.addRankedResultsCountRule();
     }
     async generateUrls() {
         const attendanceFragments = AttendancePresenter.getInstance().getFragments();

package/dist/src/organisations/policies/ranked/RankedAttendanceDiscipline.js

@@ -1,5 +1,5 @@
 import { FilterCombinations } from '../../../enums/FilterCombinations';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';
 import { OnlyFiltersSelectedRule } from '../../../common/rules/OnlyFiltersSelectedRule';
 import { OnlineAttendanceRule } from '../../../common/rules/OnlineAttendanceRule';
@@ -17,7 +17,6 @@ export class RankedAttendanceDiscipline extends RankedOrganisationsSeoIndexabili
     ];
     constructor(dependencies) {
         super(dependencies);
-        this.addRankedResultsCountRule();
     }
     get filterCombination() {
         return FilterCombinations.RANKED_ATTENDANCE_DISCIPLINE;

package/dist/src/organisations/policies/ranked/RankedContinent.js

@@ -1,5 +1,5 @@
 import { FilterCombinations } from '../../../enums/FilterCombinations';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';
 import { OnlyFiltersSelectedRule } from '../../../common/rules/OnlyFiltersSelectedRule';
 import { ContinentPresenter } from '../../../presenters/ContinentPresenter';
@@ -13,7 +13,6 @@ export class RankedContinent extends RankedOrganisationsSeoIndexabilityPolicy {
     ];
     constructor(dependencies) {
         super(dependencies);
-        this.addRankedResultsCountRule();
     }
     async generateUrls() {
         const continentFragments = ContinentPresenter.getInstance().getFragments();

package/dist/src/organisations/policies/ranked/RankedContinentAttendance.js

@@ -1,5 +1,5 @@
 import { FilterCombinations } from '../../../enums/FilterCombinations';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';
 import { OnlyFiltersSelectedRule } from '../../../common/rules/OnlyFiltersSelectedRule';
 import { OnlineAttendanceRule } from '../../../common/rules/OnlineAttendanceRule';
@@ -19,7 +19,6 @@ export class RankedContinentAttendance extends RankedOrganisationsSeoIndexabilit
     ];
     constructor(dependencies) {
         super(dependencies);
-        this.addRankedResultsCountRule();
     }
     async generateUrls() {
         const continentFragments = ContinentPresenter.getInstance().getFragments();

package/dist/src/organisations/policies/ranked/RankedCountry.js

@@ -1,6 +1,6 @@
 import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../../enums/FilterCombinations';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../../common/rules/OnlyFiltersSelectedRule';
 import { CountryPresenter } from '../../../presenters/CountryPresenter';
 import { RankedOrganisationsSeoIndexabilityPolicy } from '../RankedOrganisationsSeoIndexabilityPolicy';
@@ -10,7 +10,6 @@ export class RankedCountry extends RankedOrganisationsSeoIndexabilityPolicy {
     baseRules = [new SingleValueSelectedForFilterRule(FilterKey.COUNTRY), new OnlyFiltersSelectedRule([FilterKey.COUNTRY])];
     constructor(dependencies) {
         super(dependencies);
-        this.addRankedResultsCountRule();
     }
     async generateUrls() {
         const countryFragments = CountryPresenter.getInstance().getFragments();

package/dist/src/organisations/policies/ranked/RankedCountryAttendance.js

@@ -1,5 +1,5 @@
 import { FilterCombinations } from '../../../enums/FilterCombinations';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';
 import { OnlyFiltersSelectedRule } from '../../../common/rules/OnlyFiltersSelectedRule';
 import { OnlineAttendanceRule } from '../../../common/rules/OnlineAttendanceRule';
@@ -17,7 +17,6 @@ export class RankedCountryAttendance extends RankedOrganisationsSeoIndexabilityP
     ];
     constructor(dependencies) {
         super(dependencies);
-        this.addRankedResultsCountRule();
     }
     async generateUrls() {
         const countryFragments = CountryPresenter.getInstance().getFragments();

package/dist/src/organisations/policies/ranked/RankedCountryDiscipline.js

@@ -1,6 +1,6 @@
 import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../../enums/FilterCombinations';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../../common/rules/OnlyFiltersSelectedRule';
 import { CountryPresenter } from '../../../presenters/CountryPresenter';
 import { DisciplinePresenter } from '../../../presenters/DisciplinePresenter';
@@ -15,7 +15,6 @@ export class RankedCountryDiscipline extends RankedOrganisationsSeoIndexabilityP
     ];
     constructor(dependencies) {
         super(dependencies);
-        this.addRankedResultsCountRule();
     }
     async generateUrls() {
         const countryFragments = CountryPresenter.getInstance().getFragments();

package/dist/src/organisations/policies/ranked/RankedDiscipline.js

@@ -1,6 +1,6 @@
 import { SingleValueSelectedForFilterRule } from '../../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../../enums/FilterCombinations';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../../common/rules/OnlyFiltersSelectedRule';
 import { RankedOrganisationsSeoIndexabilityPolicy } from '../RankedOrganisationsSeoIndexabilityPolicy';
 import { DisciplinePresenter } from '../../../presenters/DisciplinePresenter';
@@ -13,7 +13,6 @@ export class RankedDiscipline extends RankedOrganisationsSeoIndexabilityPolicy {
     ];
     constructor(dependencies) {
         super(dependencies);
-        this.addRankedResultsCountRule();
     }
     async generateUrls() {
         const disciplineFragments = DisciplinePresenter.getInstance().getFragments();

package/dist/src/organisations/policies/ranked/RankedUnfiltered.js

@@ -7,7 +7,6 @@ export class RankedUnfiltered extends RankedOrganisationsSeoIndexabilityPolicy {
     baseRules = [new NoFiltersSelectedRule()];
     constructor(dependencies) {
         super(dependencies);
-        this.addRankedResultsCountRule();
     }
     async generateUrls() {
         const filterKeyValues = new Map([]);

package/dist/src/organisations/rules/AtLeastSevenResultsRule.d.ts

@@ -0,0 +1,15 @@
+import { ISearchDependencies } from '../../common/ISearchDependencies';
+import { FilterKeyValuesMap } from '../../common/FilterKeyValuesMap';
+import { ISearchApiClient } from '../../sitemap-generator/ISearchApiClient';
+import { IRule } from '../../common/IRule';
+export declare class AtLeastSevenResultsRule implements IRule {
+    private readonly minimumResultsCount;
+    private readonly maximumPageSize;
+    private readonly searchApiClient?;
+    constructor(searchApiClient?: ISearchApiClient);
+    forSearch(dependencies: ISearchDependencies): Promise<boolean>;
+    forSitemapGeneratorWithPageNumber(filterKeyValues: FilterKeyValuesMap, pageNumber: number): Promise<boolean>;
+    forSitemapGenerator(): Promise<boolean>;
+    getName(): string;
+    getDescription(): string;
+}

package/dist/src/organisations/rules/AtLeastSevenResultsRule.js

@@ -0,0 +1,30 @@
+import { DependencyMissingError } from '../../errors/DependencyMissingError';
+export class AtLeastSevenResultsRule {
+    minimumResultsCount = 7;
+    maximumPageSize = 20;
+    searchApiClient;
+    constructor(searchApiClient) {
+        this.searchApiClient = searchApiClient;
+    }
+    forSearch(dependencies) {
+        const { applicationState } = dependencies;
+        const resultCount = applicationState.getNumberOfResults();
+        return Promise.resolve(resultCount >= this.minimumResultsCount);
+    }
+    async forSitemapGeneratorWithPageNumber(filterKeyValues, pageNumber) {
+        if (!this.searchApiClient) {
+            throw new DependencyMissingError('SearchApiClient');
+        }
+        const count = await this.searchApiClient.getCount(filterKeyValues);
+        return count >= (pageNumber - 1) * this.maximumPageSize + this.minimumResultsCount;
+    }
+    forSitemapGenerator() {
+        throw new Error('Method not implemented.');
+    }
+    getName() {
+        return 'AtLeastSevenResultsRule';
+    }
+    getDescription() {
+        return 'Is indexable if there are at least 2 results.';
+    }
+}

package/dist/src/organisations/rules/BaseSearchVolumeOrganisationsRule.d.ts

@@ -1,7 +1,7 @@
 import { FilterKeyValuesMap } from '../../common/FilterKeyValuesMap';
 import { IRule } from '../../common/IRule';
 import { ISearchDependencies } from '../../common/ISearchDependencies';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 export declare abstract class BaseSearchVolumeOrganisationsRule implements IRule {
     private readonly filterKey;
     private readonly idsWithSearchVolume;

package/dist/src/organisations/rules/ContinentIsEuropeRule.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { BaseFilterKeyValueRule } from '../../common/rules/BaseFilterKeyValueRule';
 export class ContinentIsEuropeRule extends BaseFilterKeyValueRule {
     constructor() {

package/dist/src/organisations/rules/SearchVolumeAreasAttendanceRule.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { BaseSearchVolumeOrganisationsRule } from './BaseSearchVolumeOrganisationsRule';
 export class SearchVolumeAreasAttendanceRule extends BaseSearchVolumeOrganisationsRule {
     constructor() {

package/dist/src/organisations/rules/SearchVolumeAreasDisciplineRule.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { BaseSearchVolumeOrganisationsRule } from './BaseSearchVolumeOrganisationsRule';
 export class SearchVolumeAreasDisciplineRule extends BaseSearchVolumeOrganisationsRule {
     constructor() {

package/dist/src/organisations/rules/SearchVolumeCountriesAttendanceRule.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { BaseSearchVolumeOrganisationsRule } from './BaseSearchVolumeOrganisationsRule';
 export class SearchVolumeCountriesAttendanceRule extends BaseSearchVolumeOrganisationsRule {
     constructor() {

package/dist/src/presenters/AreaPresenter.d.ts

@@ -1,6 +1,6 @@
 import { IAreaFragment } from './fragments/IAreaFragment';
 import { IPresenter } from '../common';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 export declare class AreaPresenter implements IPresenter {
     readonly filterKey: FilterKey;
     private static instance;

package/dist/src/presenters/AreaPresenter.js

@@ -1,6 +1,6 @@
 import { areasAll } from '@studyportals/static-domain-data/areas/areas';
 import { areaGetPath } from '@studyportals/static-domain-data/areas/area-get-path';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 export class AreaPresenter {
     filterKey = FilterKey.AREA;
     static instance;

package/dist/src/presenters/AttendancePresenter.d.ts

@@ -1,6 +1,6 @@
 import { IPresenter } from '../common';
 import { IFragment } from './fragments/IFragment';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 export declare class AttendancePresenter implements IPresenter {
     readonly filterKey: FilterKey;
     private static instance;

package/dist/src/presenters/AttendancePresenter.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 export class AttendancePresenter {
     filterKey = FilterKey.DELIVERY_METHOD;
     static instance;
@@ -8,10 +8,6 @@ export class AttendancePresenter {
             {
                 id: 'online',
                 path: 'online'
-            },
-            {
-                id: 'blended',
-                path: 'blended'
             }
         ];
     }

package/dist/src/presenters/ContinentPresenter.d.ts

@@ -1,6 +1,6 @@
 import { IFragment } from './fragments/IFragment';
 import { IPresenter } from '../common';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 export declare class ContinentPresenter implements IPresenter {
     readonly filterKey: FilterKey;
     private static instance;

package/dist/src/presenters/ContinentPresenter.js

@@ -1,6 +1,6 @@
 import { continentsAll } from '@studyportals/static-domain-data/continents/continents';
 import { continentGetPath } from '@studyportals/static-domain-data/continents/continent-get-path';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 export class ContinentPresenter {
     filterKey = FilterKey.CONTINENT;
     static instance;

package/dist/src/presenters/CountryPresenter.d.ts

@@ -1,6 +1,6 @@
 import { ICountryFragment } from './fragments/ICountryFragment';
 import { IPresenter } from '../common';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 export declare class CountryPresenter implements IPresenter {
     readonly filterKey: FilterKey;
     private static instance;