@studyportals/fawkes 7.4.2-4 → 8.0.1-1

package/dist/src/presenters/CountryPresenter.js

@@ -1,6 +1,6 @@
 import { countriesExtendedAll } from '@studyportals/static-domain-data/countries/countries-extended';
 import { countryGetIsoCodePath } from '@studyportals/static-domain-data/countries/country-get-iso-path';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 export class CountryPresenter {
     filterKey = FilterKey.COUNTRY;
     static instance;

package/dist/src/presenters/DegreePresenter.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 DegreePresenter implements IPresenter {
     readonly filterKey: FilterKey;
     private static instance;

package/dist/src/presenters/DegreePresenter.js

@@ -1,4 +1,4 @@
-import { DegreeTypeFilterOptionValue, FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { DegreeTypeFilterOptionValue, FilterKey } from '@studyportals/search-filters';
 export class DegreePresenter {
     filterKey = FilterKey.DEGREE_TYPE;
     static instance;

package/dist/src/presenters/DisciplinePresenter.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 DisciplinePresenter implements IPresenter {
     readonly filterKey: FilterKey;
     private static instance;

package/dist/src/presenters/DisciplinePresenter.js

@@ -1,7 +1,7 @@
 import { disciplinesAll } from '@studyportals/static-domain-data/disciplines/disciplines';
 import { subdisciplinesAll } from '@studyportals/static-domain-data/disciplines/subdisciplines';
 import { disciplineGetVirtualPath } from '@studyportals/static-domain-data/disciplines/discipline-get-virtual-path';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 export class DisciplinePresenter {
     filterKey = FilterKey.DISCIPLINES;
     static instance;

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

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

package/dist/src/presenters/DurationPresenter.js

@@ -1,4 +1,4 @@
-import { DurationFilterOptionValue, FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { DurationFilterOptionValue, FilterKey } from '@studyportals/search-filters';
 export class DurationPresenter {
     filterKey = FilterKey.DURATION;
     static instance;

package/dist/src/presenters/EducationalFormPresenter.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 EducationalFormPresenter implements IPresenter {
     readonly filterKey: FilterKey;
     private static instance;

package/dist/src/presenters/EducationalFormPresenter.js

@@ -1,4 +1,4 @@
-import { EducationalFormFilterOptionValue, FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { EducationalFormFilterOptionValue, FilterKey } from '@studyportals/search-filters';
 export class EducationalFormPresenter {
     filterKey = FilterKey.EDUCATIONAL_FORM;
     static instance;

package/dist/src/presenters/FormatPresenter.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 FormatPresenter implements IPresenter {
     readonly filterKey: FilterKey;
     private static instance;

package/dist/src/presenters/FormatPresenter.js

@@ -1,17 +1,14 @@
-import { FormatFilterOptionValue, FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FormatFilterOptionValue, FilterKey } from '@studyportals/search-filters';
 export class FormatPresenter {
     filterKey = FilterKey.ATTENDANCE;
     static instance;
     fragments;
     constructor() {
+        // Part-time is the only indexable format according to PartTimeFormatRule
         this.fragments = [
             {
                 id: FormatFilterOptionValue.PART_TIME,
                 path: 'part-time'
-            },
-            {
-                id: FormatFilterOptionValue.FULL_TIME,
-                path: 'full-time'
             }
         ];
     }

package/dist/src/presenters/SpecialProgrammesPresenter.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 SpecialProgrammesPresenter implements IPresenter {
     readonly filterKey: FilterKey;
     private static instance;

package/dist/src/presenters/SpecialProgrammesPresenter.js

@@ -1,4 +1,4 @@
-import { SpecialProgrammesFilterOptionValue, FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { SpecialProgrammesFilterOptionValue, FilterKey } from '@studyportals/search-filters';
 export class SpecialProgrammesPresenter {
     filterKey = FilterKey.SPECIAL_PROGRAMMES;
     static instance;
@@ -12,10 +12,6 @@ export class SpecialProgrammesPresenter {
             {
                 id: SpecialProgrammesFilterOptionValue.ERASMUS_MUNDUS,
                 path: 'erasmus-mundus'
-            },
-            {
-                id: SpecialProgrammesFilterOptionValue.EXECUTIVE_PROGRAMMES,
-                path: 'executive-programmes'
             }
         ];
     }

package/dist/src/presenters/TuitionFeePresenter.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 TuitionFeePresenter implements IPresenter {
     readonly filterKey: FilterKey;
     private static instance;

package/dist/src/presenters/TuitionFeePresenter.js

@@ -1,4 +1,4 @@
-import { TuitionFeeFilterOptionValue, FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { TuitionFeeFilterOptionValue, FilterKey } from '@studyportals/search-filters';
 export class TuitionFeePresenter {
     filterKey = FilterKey.TUITION_FEE;
     static instance;

package/dist/src/programmes/ProgrammesBaseIndexabilityPolicy.d.ts

@@ -1,7 +1,7 @@
 import { BaseSeoIndexabilityPolicy } from '../common/policies/BaseSeoIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from './types/IProgrammeSeoDependencies';
 import { IProgrammeSitemapUrlGenerator } from './types/IProgrammeSitemapUrlGenerator';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { FilterKeyValuesMap } from '../../sitemap-generator-seo';
 import { IProgrammeRule } from './IProgrammeRule';
 import { IRule } from '../common/IRule';

package/dist/src/programmes/SearchIndexabilityManager.js

@@ -1,4 +1,4 @@
-import { Area, Attendance, AttendanceDegree, Continent, ContinentTuitionFee, Country, CountryAttendance, CountryAttendanceDegree, CountryDegree, CountryDuration, CountryDurationDegree, CountryEducationalForm, CountryFormat, CountryTuitionFee, DegreeAttendanceDiscipline, DegreeCountryAttendance, DegreeCountryDiscipline, DegreeCountryTuitionFee, Discipline, DisciplineAttendance, DisciplineContinent, DisciplineCountry, DisciplineCountryEducationalForm, DisciplineDegree, DisciplineDuration, DisciplineEducationalForm, DisciplineFormat, DisciplineTuitionFee, DisciplineTuitionFeeAttendance, SpecialProgrammes, TuitionFee, Unfiltered, AttendanceArea, AttendanceContinent, AttendanceDuration, AttendanceFormat, AttendanceTuitionFee, ContinentDuration, ContinentFormat, ContinentSpecialProgrammes, CountrySpecialProgrammes, DegreeArea, DegreeAreaTuitionFee, DegreeAttendanceFormat, DegreeAttendanceTuitionFee, DegreeContinent, DegreeContinentTuitionFee, DegreeDuration, DegreeFormat, DegreeFormatTuitionFee, DegreeSpecialProgrammes, DegreeTuitionFee, DisciplineContinentAttendance, DisciplineCountryAttendance, DisciplineCountryFormat, Duration, Format } from './policies';
+import { Area, Attendance, AttendanceDegree, Continent, ContinentTuitionFee, Country, CountryAttendance, CountryAttendanceDegree, CountryDegree, CountryDuration, CountryDurationDegree, CountryEducationalForm, CountryFormat, CountryTuitionFee, DegreeAttendanceDiscipline, DegreeCountryAttendance, DegreeCountryDiscipline, DegreeCountryTuitionFee, Discipline, DisciplineArea, DisciplineAttendance, DisciplineContinent, DisciplineCountry, DisciplineCountryEducationalForm, DisciplineDegree, DisciplineDuration, DisciplineEducationalForm, DisciplineFormat, DisciplineTuitionFee, DisciplineTuitionFeeAttendance, SpecialProgrammes, TuitionFee, Unfiltered } from './policies';
 import { DependencyTypes } from '../enums/DependencyTypes';
 import { Degree } from './policies/Degree';
 export class SearchIndexabilityManager {
@@ -32,6 +32,7 @@ export class SearchIndexabilityManager {
             new DegreeCountryDiscipline(dependencies),
             new DegreeCountryTuitionFee(dependencies),
             new Discipline(dependencies),
+            new DisciplineArea(dependencies),
             new DisciplineAttendance(dependencies),
             new DisciplineContinent(dependencies),
             new DisciplineCountry(dependencies),
@@ -44,32 +45,7 @@ export class SearchIndexabilityManager {
             new DisciplineTuitionFeeAttendance(dependencies),
             new SpecialProgrammes(dependencies),
             new TuitionFee(dependencies),
-            new Unfiltered(dependencies),
-            new CountrySpecialProgrammes(dependencies),
-            new DegreeArea(dependencies),
-            new DegreeAreaTuitionFee(dependencies),
-            new DegreeAttendanceFormat(dependencies),
-            new DegreeAttendanceTuitionFee(dependencies),
-            new DegreeContinent(dependencies),
-            new DegreeContinentTuitionFee(dependencies),
-            new DegreeDuration(dependencies),
-            new DegreeFormat(dependencies),
-            new DegreeFormatTuitionFee(dependencies),
-            new DegreeSpecialProgrammes(dependencies),
-            new DegreeTuitionFee(dependencies),
-            new DisciplineContinentAttendance(dependencies),
-            new DisciplineCountryAttendance(dependencies),
-            new DisciplineCountryFormat(dependencies),
-            new Duration(dependencies),
-            new Format(dependencies),
-            new AttendanceArea(dependencies),
-            new AttendanceContinent(dependencies),
-            new AttendanceDuration(dependencies),
-            new AttendanceFormat(dependencies),
-            new AttendanceTuitionFee(dependencies),
-            new ContinentDuration(dependencies),
-            new ContinentFormat(dependencies),
-            new ContinentSpecialProgrammes(dependencies),
+            new Unfiltered(dependencies)
         ];
     }
     getPolicies() {

package/dist/src/programmes/policies/Area.d.ts

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/Area.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/Attendance.d.ts

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/Attendance.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/AttendanceDegree.d.ts

@@ -1,15 +1,16 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
+import { OnlineAttendanceRule } from '../../common/rules/OnlineAttendanceRule';
+import { IndexableDegreeRule } from '../rules/IndexableDegreeRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
-import { IndexableDegreeRule } from '../rules/IndexableDegreeRule';
 export declare class AttendanceDegree extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | IndexableDegreeRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | OnlineAttendanceRule | IndexableDegreeRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;

package/dist/src/programmes/policies/AttendanceDegree.js

@@ -1,20 +1,22 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
+import { OnlineAttendanceRule } from '../../common/rules/OnlineAttendanceRule';
+import { IndexableDegreeRule } from '../rules/IndexableDegreeRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { AttendancePresenter } from '../../presenters/AttendancePresenter';
 import { DegreePresenter } from '../../presenters/DegreePresenter';
-import { IndexableDegreeRule } from '../rules/IndexableDegreeRule';
 export class AttendanceDegree extends ProgrammesBaseIndexabilityPolicy {
     name = 'Attendance Degree Type Policy';
-    description = 'Determines indexing rules for pages filtered by both study format (online, blended, on-campus, etc.), and degree type prioritizing degrees and formats with demonstrated search demand.';
+    description = 'Determines indexing rules for pages filtered by both study format (online, on-campus, etc.), and degree type prioritizing degrees and formats with demonstrated search demand.';
     filterKeys = [FilterKey.DELIVERY_METHOD, FilterKey.DEGREE_TYPE];
     rules = [
         new SingleValueSelectedForFilterRule(FilterKey.DELIVERY_METHOD),
         new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
         new OnlyFiltersSelectedRule([FilterKey.DELIVERY_METHOD, FilterKey.DEGREE_TYPE]),
-        new IndexableDegreeRule()
+        new IndexableDegreeRule(),
+        new OnlineAttendanceRule()
     ];
     constructor(dependencies) {
         super(dependencies);
@@ -23,12 +25,9 @@ export class AttendanceDegree extends ProgrammesBaseIndexabilityPolicy {
     async generateUrls() {
         const attendanceFragments = AttendancePresenter.getInstance().getFragments();
         const degreeFragments = DegreePresenter.getInstance().getFragments();
-        // Allow online and blended learning formats
-        const allowedAttendanceIds = ["online", "blended"];
-        const allowedAttendances = attendanceFragments.filter(attendance => allowedAttendanceIds.includes(attendance.id));
         const paths = [];
         for (const pageNumber of this.indexablePageNumbers) {
-            for (const attendance of allowedAttendances) {
+            for (const attendance of attendanceFragments) {
                 for (const degree of degreeFragments) {
                     const filterKeyValues = new Map([
                         [FilterKey.DELIVERY_METHOD, [attendance.id]],

package/dist/src/programmes/policies/Continent.d.ts

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/Continent.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/ContinentTuitionFee.d.ts

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/ContinentTuitionFee.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/Country.d.ts

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/Country.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/CountryAttendance.d.ts

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/CountryAttendance.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/CountryAttendanceDegree.d.ts

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/CountryAttendanceDegree.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
@@ -10,7 +10,7 @@ import { AttendancePresenter } from '../../presenters/AttendancePresenter';
 import { DegreePresenter } from '../../presenters/DegreePresenter';
 export class CountryAttendanceDegree extends ProgrammesBaseIndexabilityPolicy {
     name = 'Country Attendance Degree Policy';
-    description = `Determines indexing rules for pages filtered by country,
+    description = `Determines indexing rules for pages filtered by country,
 		study format (online, on-campus, etc.), and degree type.`;
     filterKeys = [FilterKey.COUNTRY, FilterKey.DELIVERY_METHOD, FilterKey.DEGREE_TYPE];
     rules = [

package/dist/src/programmes/policies/CountryDegree.d.ts

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/CountryDegree.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/CountryDuration.d.ts

@@ -1,15 +1,15 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
-import { OneYearOnlyRule } from '../rules/OneYearOnlyRule';
+import { IndexableDurationRule } from '../rules/IndexableDurationRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
 export declare class CountryDuration extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | OneYearOnlyRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | IndexableDurationRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;

package/dist/src/programmes/policies/CountryDuration.js

@@ -1,20 +1,20 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
-import { OneYearOnlyRule } from '../rules/OneYearOnlyRule';
+import { IndexableDurationRule } from '../rules/IndexableDurationRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { CountryPresenter } from '../../presenters/CountryPresenter';
 import { DurationPresenter } from '../../presenters/DurationPresenter';
 export class CountryDuration extends ProgrammesBaseIndexabilityPolicy {
     name = 'Country Duration Policy';
-    description = 'Determines indexing rules for pages filtered by both country, and duration (1 year only).';
+    description = 'Determines indexing rules for pages filtered by both country, and duration (1 year, 2 years, etc.).';
     filterKeys = [FilterKey.COUNTRY, FilterKey.DURATION];
     rules = [
         new SingleValueSelectedForFilterRule(FilterKey.COUNTRY),
         new SingleValueSelectedForFilterRule(FilterKey.DURATION),
         new OnlyFiltersSelectedRule([FilterKey.COUNTRY, FilterKey.DURATION]),
-        new OneYearOnlyRule()
+        new IndexableDurationRule()
     ];
     constructor(dependencies) {
         super(dependencies);
@@ -23,12 +23,10 @@ export class CountryDuration extends ProgrammesBaseIndexabilityPolicy {
     async generateUrls() {
         const countryFragments = CountryPresenter.getInstance().getFragments();
         const durationFragments = DurationPresenter.getInstance().getFragments();
-        const allowedDurationIds = ["[360,360]"];
-        const allowedDurations = durationFragments.filter(duration => allowedDurationIds.includes(duration.id));
         const paths = [];
         for (const pageNumber of this.indexablePageNumbers) {
             for (const country of countryFragments) {
-                for (const duration of allowedDurations) {
+                for (const duration of durationFragments) {
                     const filterKeyValues = new Map([
                         [FilterKey.COUNTRY, [country.id]],
                         [FilterKey.DURATION, [duration.id]]

package/dist/src/programmes/policies/CountryDurationDegree.d.ts

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/CountryDurationDegree.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
@@ -10,7 +10,7 @@ import { DegreePresenter } from '../../presenters/DegreePresenter';
 import { DurationPresenter } from '../../presenters/DurationPresenter';
 export class CountryDurationDegree extends ProgrammesBaseIndexabilityPolicy {
     name = 'Country Duration Degree Policy';
-    description = `Determines indexing rules for pages filtered by country,
+    description = `Determines indexing rules for pages filtered by country,
 		duration (1 year, 2 years, etc.), and degree type.`;
     filterKeys = [FilterKey.COUNTRY, FilterKey.DURATION, FilterKey.DEGREE_TYPE];
     rules = [

package/dist/src/programmes/policies/CountryEducationalForm.d.ts

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/CountryEducationalForm.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
@@ -8,7 +8,7 @@ import { CountryPresenter } from '../../presenters/CountryPresenter';
 import { EducationalFormPresenter } from '../../presenters/EducationalFormPresenter';
 export class CountryEducationalForm extends ProgrammesBaseIndexabilityPolicy {
     name = 'Country Educational Form Policy';
-    description = `Determines indexing rules for pages filtered by both country,
+    description = `Determines indexing rules for pages filtered by both country,
 		and educational form (academic, semester, summer school, etc.).`;
     filterKeys = [FilterKey.COUNTRY, FilterKey.EDUCATIONAL_FORM];
     rules = [

package/dist/src/programmes/policies/CountryFormat.d.ts

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/CountryFormat.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/CountryTuitionFee.d.ts

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/CountryTuitionFee.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/Degree.d.ts

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/Degree.js

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DegreeAttendanceDiscipline.d.ts

@@ -1,16 +1,15 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
 import { DegreeAttendanceDisciplineSpecificRule } from '../rules/DegreeAttendanceDisciplineSpecificRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
-import { OnlineAttendanceRule } from '../../common/rules/OnlineAttendanceRule';
 export declare class DegreeAttendanceDiscipline extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | OnlineAttendanceRule | DegreeAttendanceDisciplineSpecificRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | DegreeAttendanceDisciplineSpecificRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;