@studyportals/fawkes 8.0.2-20 → 8.0.2-22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/src/programmes/policies/AttendanceDegree.js +1 -4
  2. package/dist/src/programmes/policies/ContinentSpecialProgrammes.js +1 -1
  3. package/dist/src/programmes/policies/DegreeAreaTuitionFee.js +1 -1
  4. package/dist/src/programmes/policies/DisciplineDuration.d.ts +2 -2
  5. package/dist/src/programmes/policies/DisciplineDuration.js +2 -2
  6. package/dist/src/sitemap-generator/ProgrammesSitemapUrlGeneratorManager.js +114 -56
  7. package/package.json +1 -1
package/dist/src/programmes/policies/AttendanceDegree.js CHANGED
@@ -25,12 +25,9 @@ export class AttendanceDegree extends ProgrammesBaseIndexabilityPolicy {
25
25
  async generateUrls() {
26
26
  const attendanceFragments = AttendancePresenter.getInstance().getFragments();
27
27
  const degreeFragments = DegreePresenter.getInstance().getFragments();
28
- // Allow online and blended learning formats
29
- const allowedAttendanceIds = ["online", "blended"];
30
- const allowedAttendances = attendanceFragments.filter(attendance => allowedAttendanceIds.includes(attendance.id));
31
28
  const paths = [];
32
29
  for (const pageNumber of this.indexablePageNumbers) {
33
- for (const attendance of allowedAttendances) {
30
+ for (const attendance of attendanceFragments) {
34
31
  for (const degree of degreeFragments) {
35
32
  const filterKeyValues = new Map([
36
33
  [FilterKey.DELIVERY_METHOD, [attendance.id]],
package/dist/src/programmes/policies/ContinentSpecialProgrammes.js CHANGED
@@ -35,7 +35,7 @@ export class ContinentSpecialProgrammes extends ProgrammesBaseIndexabilityPolicy
35
35
  ]);
36
36
  const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
37
37
  if (result) {
38
- paths.push(this.getPathWithPageNumber(`${continent.path}/${specialProgramme.path}`, pageNumber));
38
+ paths.push(this.getPathWithPageNumber(`${specialProgramme.path}/${continent.path}`, pageNumber));
39
39
  }
40
40
  }
41
41
  }
package/dist/src/programmes/policies/DegreeAreaTuitionFee.js CHANGED
@@ -40,7 +40,7 @@ export class DegreeAreaTuitionFee extends ProgrammesBaseIndexabilityPolicy {
40
40
  ]);
41
41
  const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
42
42
  if (result) {
43
- paths.push(this.getPathWithPageNumber(`${degree.path}/${area.path}/${tuitionFee.path}`, pageNumber));
43
+ paths.push(this.getPathWithPageNumber(`${degree.path}/${tuitionFee.path}/${area.path}`, pageNumber));
44
44
  }
45
45
  }
46
46
  }
package/dist/src/programmes/policies/DisciplineDuration.d.ts CHANGED
@@ -2,14 +2,14 @@ import { FilterKey } from '@studyportals/search-filters/server-side';
2
2
  import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
3
3
  import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
4
4
  import { FilterCombinations } from '../../enums/FilterCombinations';
5
- import { IndexableDurationRule } from '../rules/IndexableDurationRule';
6
5
  import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
7
6
  import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
7
+ import { OneOrTwoYearDurationRule } from '../rules/OneOrTwoYearDurationRule';
8
8
  export declare class DisciplineDuration extends ProgrammesBaseIndexabilityPolicy {
9
9
  readonly name: string;
10
10
  readonly description: string;
11
11
  readonly filterKeys: FilterKey[];
12
- protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | IndexableDurationRule)[];
12
+ protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | OneOrTwoYearDurationRule)[];
13
13
  constructor(dependencies: IProgrammeSeoDependencies);
14
14
  protected generateUrls(): Promise<string[]>;
15
15
  get filterCombination(): FilterCombinations;
package/dist/src/programmes/policies/DisciplineDuration.js CHANGED
@@ -2,10 +2,10 @@ import { FilterKey } from '@studyportals/search-filters/server-side';
2
2
  import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
3
3
  import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
4
4
  import { FilterCombinations } from '../../enums/FilterCombinations';
5
- import { IndexableDurationRule } from '../rules/IndexableDurationRule';
6
5
  import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
7
6
  import { DisciplinePresenter } from '../../presenters/DisciplinePresenter';
8
7
  import { DurationPresenter } from '../../presenters/DurationPresenter';
8
+ import { OneOrTwoYearDurationRule } from '../rules/OneOrTwoYearDurationRule';
9
9
  export class DisciplineDuration extends ProgrammesBaseIndexabilityPolicy {
10
10
  name = 'Discipline Duration Policy';
11
11
  description = 'Determines indexing rules for pages filtered by both discipline, and duration (1 year, 2 years, etc.).';
@@ -14,7 +14,7 @@ export class DisciplineDuration extends ProgrammesBaseIndexabilityPolicy {
14
14
  new SingleValueSelectedForFilterRule(FilterKey.DISCIPLINES),
15
15
  new SingleValueSelectedForFilterRule(FilterKey.DURATION),
16
16
  new OnlyFiltersSelectedRule([FilterKey.DISCIPLINES, FilterKey.DURATION]),
17
- new IndexableDurationRule()
17
+ new OneOrTwoYearDurationRule()
18
18
  ];
19
19
  constructor(dependencies) {
20
20
  super(dependencies);
package/dist/src/sitemap-generator/ProgrammesSitemapUrlGeneratorManager.js CHANGED
@@ -1,6 +1,64 @@
1
1
  import { DependencyTypes } from '../enums/DependencyTypes';
2
2
  import { BaseSitemapUrlGeneratorManager } from './BaseSitemapUrlGeneratorManager';
3
- import { Area, Attendance, AttendanceDegree, Continent, ContinentTuitionFee, Country, CountryAttendance, Discipline, SpecialProgrammes, TuitionFee, Unfiltered, CountryAttendanceDegree, CountryDuration, CountryDurationDegree, CountryEducationalForm, CountryFormat, CountryTuitionFee, DegreeAttendanceDiscipline, DegreeCountryAttendance, DegreeCountryDiscipline, DegreeCountryTuitionFee, Format, DisciplineAttendance, DisciplineContinent, DisciplineCountry, DisciplineCountryEducationalForm, DisciplineDegree, DisciplineDuration, DisciplineEducationalForm, DisciplineFormat, DisciplineTuitionFee, DisciplineTuitionFeeAttendance, CountryDegree, DegreeFormat, DegreeContinent, DegreeAttendanceTuitionFee, DegreeArea, DegreeTuitionFee, AttendanceTuitionFee, Duration, AttendanceDuration, DegreeAreaTuitionFee, DisciplineContinentAttendance, DegreeContinentTuitionFee, AttendanceFormat, ContinentFormat, AttendanceContinent, DegreeDuration, ContinentSpecialProgrammes, CountrySpecialProgrammes, AttendanceArea, DegreeFormatTuitionFee, ContinentDuration, DegreeAttendanceFormat, DisciplineCountryAttendance, DisciplineCountryFormat, DegreeSpecialProgrammes, Degree } from '../programmes/policies';
3
+ import {
4
+ // Area,
5
+ // Attendance,
6
+ AttendanceDegree,
7
+ // Continent,
8
+ // ContinentTuitionFee,
9
+ // Country,
10
+ // CountryAttendance,
11
+ // Discipline,
12
+ SpecialProgrammes,
13
+ // TuitionFee,
14
+ Unfiltered,
15
+ // CountryAttendanceDegree,
16
+ // CountryDuration,
17
+ // CountryDurationDegree,
18
+ // CountryEducationalForm,
19
+ // CountryFormat,
20
+ // CountryTuitionFee,
21
+ // DegreeAttendanceDiscipline,
22
+ // DegreeCountryAttendance,
23
+ // DegreeCountryDiscipline,
24
+ // DegreeCountryTuitionFee,
25
+ // Format,
26
+ // DisciplineAttendance,
27
+ // DisciplineContinent,
28
+ // DisciplineCountry,
29
+ // DisciplineCountryEducationalForm,
30
+ // DisciplineDegree,
31
+ DisciplineDuration,
32
+ // DisciplineEducationalForm,
33
+ // DisciplineFormat,
34
+ // DisciplineTuitionFee,
35
+ // DisciplineTuitionFeeAttendance,
36
+ // CountryDegree,
37
+ // DegreeFormat,
38
+ // DegreeContinent,
39
+ // DegreeAttendanceTuitionFee,
40
+ // DegreeArea,
41
+ // DegreeTuitionFee,
42
+ // AttendanceTuitionFee,
43
+ Duration,
44
+ // AttendanceDuration,
45
+ // DegreeAreaTuitionFee,
46
+ // DisciplineContinentAttendance,
47
+ // DegreeContinentTuitionFee,
48
+ // AttendanceFormat,
49
+ // ContinentFormat,
50
+ // AttendanceContinent,
51
+ // DegreeDuration,
52
+ ContinentSpecialProgrammes, CountrySpecialProgrammes,
53
+ // AttendanceArea,
54
+ // DegreeFormatTuitionFee,
55
+ // ContinentDuration,
56
+ // DegreeAttendanceFormat,
57
+ // DisciplineCountryAttendance,
58
+ // DisciplineCountryFormat,
59
+ // DegreeSpecialProgrammes,
60
+ // Degree
61
+ } from '../programmes/policies';
4
62
  import { FilterKey } from '@studyportals/search-filters/server-side';
5
63
  import { AreaPresenter } from '../presenters/AreaPresenter';
6
64
  import { AttendancePresenter } from '../presenters/AttendancePresenter';
@@ -13,8 +71,8 @@ import { SpecialProgrammesPresenter } from '../presenters/SpecialProgrammesPrese
13
71
  import { DurationPresenter } from '../presenters/DurationPresenter';
14
72
  import { EducationalFormPresenter } from '../presenters/EducationalFormPresenter';
15
73
  import { FormatPresenter } from '../presenters/FormatPresenter';
16
- import { DisciplineSpecialProgrammes } from '../programmes/policies/DisciplineSpecialProgrammes';
17
- import { DegreeAttendanceSpecialProgrammes } from '../programmes/policies/DegreeAttendanceSpecialProgrammes';
74
+ // import { DisciplineSpecialProgrammes } from '../programmes/policies/DisciplineSpecialProgrammes';
75
+ // import { DegreeAttendanceSpecialProgrammes } from '../programmes/policies/DegreeAttendanceSpecialProgrammes';
18
76
  export class ProgrammesSitemapUrlGeneratorManager extends BaseSitemapUrlGeneratorManager {
19
77
  portalType;
20
78
  policies;
@@ -28,66 +86,66 @@ export class ProgrammesSitemapUrlGeneratorManager extends BaseSitemapUrlGenerato
28
86
  portalType
29
87
  };
30
88
  this.policies = [
31
- new Area(dependencies),
32
- new Attendance(dependencies),
89
+ // new Area(dependencies),
90
+ // new Attendance(dependencies),
33
91
  new AttendanceDegree(dependencies),
34
- new AttendanceDuration(dependencies),
35
- new AttendanceContinent(dependencies),
36
- new Continent(dependencies),
37
- new ContinentTuitionFee(dependencies),
38
- new Country(dependencies),
39
- new CountryAttendance(dependencies),
40
- new Discipline(dependencies),
41
- new Degree(dependencies),
92
+ // new AttendanceDuration(dependencies),
93
+ // new AttendanceContinent(dependencies),
94
+ // new Continent(dependencies),
95
+ // new ContinentTuitionFee(dependencies),
96
+ // new Country(dependencies),
97
+ // new CountryAttendance(dependencies),
98
+ // new Discipline(dependencies),
99
+ // new Degree(dependencies),
42
100
  new SpecialProgrammes(dependencies),
43
- new TuitionFee(dependencies),
101
+ // new TuitionFee(dependencies),
44
102
  new Unfiltered(dependencies),
45
103
  new Duration(dependencies),
46
- new CountryAttendanceDegree(dependencies),
47
- new CountryDegree(dependencies),
48
- new CountryDuration(dependencies),
49
- new CountryDurationDegree(dependencies),
50
- new CountryEducationalForm(dependencies),
51
- new CountryFormat(dependencies),
52
- new CountryTuitionFee(dependencies),
104
+ // new CountryAttendanceDegree(dependencies),
105
+ // new CountryDegree(dependencies),
106
+ // new CountryDuration(dependencies),
107
+ // new CountryDurationDegree(dependencies),
108
+ // new CountryEducationalForm(dependencies),
109
+ // new CountryFormat(dependencies),
110
+ // new CountryTuitionFee(dependencies),
53
111
  new CountrySpecialProgrammes(dependencies),
54
- new ContinentFormat(dependencies),
112
+ // new ContinentFormat(dependencies),
55
113
  new ContinentSpecialProgrammes(dependencies),
56
- new ContinentDuration(dependencies),
57
- new DegreeAttendanceDiscipline(dependencies),
58
- new DegreeCountryAttendance(dependencies),
59
- new DegreeCountryDiscipline(dependencies),
60
- new DegreeCountryTuitionFee(dependencies),
61
- new DegreeFormat(dependencies),
62
- new DegreeContinent(dependencies),
63
- new DegreeAttendanceTuitionFee(dependencies),
64
- new DegreeArea(dependencies),
65
- new DegreeTuitionFee(dependencies),
66
- new DegreeAreaTuitionFee(dependencies),
67
- new DegreeContinentTuitionFee(dependencies),
68
- new DegreeDuration(dependencies),
69
- new DegreeFormatTuitionFee(dependencies),
70
- new DegreeAttendanceFormat(dependencies),
71
- new DegreeSpecialProgrammes(dependencies),
72
- new DegreeAttendanceSpecialProgrammes(dependencies),
73
- new Format(dependencies),
74
- new DisciplineAttendance(dependencies),
75
- new DisciplineContinent(dependencies),
76
- new DisciplineCountry(dependencies),
77
- new DisciplineCountryEducationalForm(dependencies),
78
- new DisciplineDegree(dependencies),
114
+ // new ContinentDuration(dependencies),
115
+ // new DegreeAttendanceDiscipline(dependencies),
116
+ // new DegreeCountryAttendance(dependencies),
117
+ // new DegreeCountryDiscipline(dependencies),
118
+ // new DegreeCountryTuitionFee(dependencies),
119
+ // new DegreeFormat(dependencies),
120
+ // new DegreeContinent(dependencies),
121
+ // new DegreeAttendanceTuitionFee(dependencies),
122
+ // new DegreeArea(dependencies),
123
+ // new DegreeTuitionFee(dependencies),
124
+ // new DegreeAreaTuitionFee(dependencies),
125
+ // new DegreeContinentTuitionFee(dependencies),
126
+ // new DegreeDuration(dependencies),
127
+ // new DegreeFormatTuitionFee(dependencies),
128
+ // new DegreeAttendanceFormat(dependencies),
129
+ // new DegreeSpecialProgrammes(dependencies),
130
+ // new DegreeAttendanceSpecialProgrammes(dependencies),
131
+ // new Format(dependencies),
132
+ // new DisciplineAttendance(dependencies),
133
+ // new DisciplineContinent(dependencies),
134
+ // new DisciplineCountry(dependencies),
135
+ // new DisciplineCountryEducationalForm(dependencies),
136
+ // new DisciplineDegree(dependencies),
79
137
  new DisciplineDuration(dependencies),
80
- new DisciplineEducationalForm(dependencies),
81
- new DisciplineFormat(dependencies),
82
- new DisciplineTuitionFee(dependencies),
83
- new DisciplineTuitionFeeAttendance(dependencies),
84
- new DisciplineContinentAttendance(dependencies),
85
- new DisciplineCountryAttendance(dependencies),
86
- new DisciplineCountryFormat(dependencies),
87
- new DisciplineSpecialProgrammes(dependencies),
88
- new AttendanceTuitionFee(dependencies),
89
- new AttendanceFormat(dependencies),
90
- new AttendanceArea(dependencies)
138
+ // new DisciplineEducationalForm(dependencies),
139
+ // new DisciplineFormat(dependencies),
140
+ // new DisciplineTuitionFee(dependencies),
141
+ // new DisciplineTuitionFeeAttendance(dependencies),
142
+ // new DisciplineContinentAttendance(dependencies),
143
+ // new DisciplineCountryAttendance(dependencies),
144
+ // new DisciplineCountryFormat(dependencies),
145
+ // new DisciplineSpecialProgrammes(dependencies),
146
+ // new AttendanceTuitionFee(dependencies),
147
+ // new AttendanceFormat(dependencies),
148
+ // new AttendanceArea(dependencies)
91
149
  ];
92
150
  this.presenters.set(FilterKey.AREA, AreaPresenter.getInstance());
93
151
  this.presenters.set(FilterKey.DELIVERY_METHOD, AttendancePresenter.getInstance());
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@studyportals/fawkes",
3
- "version": "8.0.2-20",
3
+ "version": "8.0.2-22",
4
4
  "description": "A package to centralize SEO related logic for SBLP and Sitemap Generator.",
5
5
  "files": [
6
6
  "./dist"