@studyportals/fawkes 8.1.2-3 → 8.1.2-5
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.
- package/dist/src/programmes/policies/ContinentDuration.js +1 -1
- package/dist/src/programmes/policies/ContinentFormat.js +1 -1
- package/dist/src/programmes/policies/DegreeContinentTuitionFee.js +1 -1
- package/dist/src/programmes/policies/DisciplineCountryAttendance.js +1 -3
- package/dist/src/programmes/policies/DisciplineSpecialProgrammes.js +1 -1
- package/dist/src/programmes/policies/Format.js +2 -4
- package/dist/src/programmes/policies/index.d.ts +2 -0
- package/dist/src/programmes/policies/index.js +2 -0
- package/dist/src/sitemap-generator/ProgrammesSitemapUrlGeneratorManager.js +54 -114
- package/package.json +1 -1
|
@@ -35,7 +35,7 @@ export class ContinentDuration extends ProgrammesBaseIndexabilityPolicy {
|
|
|
35
35
|
]);
|
|
36
36
|
const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
|
|
37
37
|
if (result) {
|
|
38
|
-
paths.push(this.getPathWithPageNumber(`${
|
|
38
|
+
paths.push(this.getPathWithPageNumber(`${duration.path}/${continent.path}`, pageNumber));
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
}
|
|
@@ -35,7 +35,7 @@ export class ContinentFormat extends ProgrammesBaseIndexabilityPolicy {
|
|
|
35
35
|
]);
|
|
36
36
|
const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
|
|
37
37
|
if (result) {
|
|
38
|
-
paths.push(this.getPathWithPageNumber(`${
|
|
38
|
+
paths.push(this.getPathWithPageNumber(`${format.path}/${continent.path}`, pageNumber));
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
}
|
|
@@ -38,7 +38,7 @@ export class DegreeContinentTuitionFee extends ProgrammesBaseIndexabilityPolicy
|
|
|
38
38
|
]);
|
|
39
39
|
const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
|
|
40
40
|
if (result) {
|
|
41
|
-
paths.push(this.getPathWithPageNumber(`${degree.path}/${
|
|
41
|
+
paths.push(this.getPathWithPageNumber(`${degree.path}/${tuitionFee.path}/${continent.path}`, pageNumber));
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
}
|
|
@@ -27,12 +27,10 @@ export class DisciplineCountryAttendance extends ProgrammesBaseIndexabilityPolic
|
|
|
27
27
|
const countryFragments = CountryPresenter.getInstance().getFragments();
|
|
28
28
|
const attendanceFragments = AttendancePresenter.getInstance().getFragments();
|
|
29
29
|
const paths = [];
|
|
30
|
-
const allowedAttendanceIds = ['online'];
|
|
31
|
-
const allowedAttendances = attendanceFragments.filter(a => allowedAttendanceIds.includes(a.id));
|
|
32
30
|
for (const pageNumber of this.indexablePageNumbers) {
|
|
33
31
|
for (const discipline of disciplineFragments) {
|
|
34
32
|
for (const country of countryFragments) {
|
|
35
|
-
for (const attendance of
|
|
33
|
+
for (const attendance of attendanceFragments) {
|
|
36
34
|
const filterKeyValues = new Map([
|
|
37
35
|
[FilterKey.DISCIPLINES, [discipline.id]],
|
|
38
36
|
[FilterKey.COUNTRY, [country.id]],
|
|
@@ -35,7 +35,7 @@ export class DisciplineSpecialProgrammes extends ProgrammesBaseIndexabilityPolic
|
|
|
35
35
|
]);
|
|
36
36
|
const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
|
|
37
37
|
if (result) {
|
|
38
|
-
paths.push(this.getPathWithPageNumber(`${
|
|
38
|
+
paths.push(this.getPathWithPageNumber(`${specialProgramme.path}/${discipline.path}`, pageNumber));
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FilterKey
|
|
1
|
+
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';
|
|
@@ -18,11 +18,9 @@ export class Format extends ProgrammesBaseIndexabilityPolicy {
|
|
|
18
18
|
}
|
|
19
19
|
async generateUrls() {
|
|
20
20
|
const formatFragments = FormatPresenter.getInstance().getFragments();
|
|
21
|
-
const allowedFormatIds = [FormatFilterOptionValue.PART_TIME, FormatFilterOptionValue.FULL_TIME];
|
|
22
|
-
const allowedFormats = formatFragments.filter(format => allowedFormatIds.includes(format.id));
|
|
23
21
|
const paths = [];
|
|
24
22
|
for (const pageNumber of this.indexablePageNumbers) {
|
|
25
|
-
for (const format of
|
|
23
|
+
for (const format of formatFragments) {
|
|
26
24
|
const filterKeyValues = new Map([[FilterKey.ATTENDANCE, [format.id]]]);
|
|
27
25
|
const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
|
|
28
26
|
if (result) {
|
|
@@ -58,3 +58,5 @@ export * from './DisciplineCountryAttendance';
|
|
|
58
58
|
export * from './DisciplineCountryFormat';
|
|
59
59
|
export * from './DegreeSpecialProgrammes';
|
|
60
60
|
export * from './Degree';
|
|
61
|
+
export * from './DisciplineSpecialProgrammes';
|
|
62
|
+
export * from './DegreeAttendanceSpecialProgrammes';
|
|
@@ -58,3 +58,5 @@ export * from './DisciplineCountryAttendance';
|
|
|
58
58
|
export * from './DisciplineCountryFormat';
|
|
59
59
|
export * from './DegreeSpecialProgrammes';
|
|
60
60
|
export * from './Degree';
|
|
61
|
+
export * from './DisciplineSpecialProgrammes';
|
|
62
|
+
export * from './DegreeAttendanceSpecialProgrammes';
|
|
@@ -1,64 +1,6 @@
|
|
|
1
1
|
import { DependencyTypes } from '../enums/DependencyTypes';
|
|
2
2
|
import { BaseSitemapUrlGeneratorManager } from './BaseSitemapUrlGeneratorManager';
|
|
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';
|
|
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, DisciplineSpecialProgrammes, DegreeAttendanceSpecialProgrammes } from '../programmes/policies';
|
|
62
4
|
import { FilterKey } from '@studyportals/search-filters/server-side';
|
|
63
5
|
import { AreaPresenter } from '../presenters/AreaPresenter';
|
|
64
6
|
import { AttendancePresenter } from '../presenters/AttendancePresenter';
|
|
@@ -71,8 +13,6 @@ import { SpecialProgrammesPresenter } from '../presenters/SpecialProgrammesPrese
|
|
|
71
13
|
import { DurationPresenter } from '../presenters/DurationPresenter';
|
|
72
14
|
import { EducationalFormPresenter } from '../presenters/EducationalFormPresenter';
|
|
73
15
|
import { FormatPresenter } from '../presenters/FormatPresenter';
|
|
74
|
-
// import { DisciplineSpecialProgrammes } from '../programmes/policies/DisciplineSpecialProgrammes';
|
|
75
|
-
// import { DegreeAttendanceSpecialProgrammes } from '../programmes/policies/DegreeAttendanceSpecialProgrammes';
|
|
76
16
|
export class ProgrammesSitemapUrlGeneratorManager extends BaseSitemapUrlGeneratorManager {
|
|
77
17
|
portalType;
|
|
78
18
|
policies;
|
|
@@ -86,66 +26,66 @@ export class ProgrammesSitemapUrlGeneratorManager extends BaseSitemapUrlGenerato
|
|
|
86
26
|
portalType
|
|
87
27
|
};
|
|
88
28
|
this.policies = [
|
|
89
|
-
|
|
90
|
-
|
|
29
|
+
new Area(dependencies),
|
|
30
|
+
new Attendance(dependencies),
|
|
91
31
|
new AttendanceDegree(dependencies),
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
32
|
+
new AttendanceDuration(dependencies),
|
|
33
|
+
new AttendanceContinent(dependencies),
|
|
34
|
+
new Continent(dependencies),
|
|
35
|
+
new ContinentTuitionFee(dependencies),
|
|
36
|
+
new Country(dependencies),
|
|
37
|
+
new CountryAttendance(dependencies),
|
|
38
|
+
new Discipline(dependencies),
|
|
39
|
+
new Degree(dependencies),
|
|
100
40
|
new SpecialProgrammes(dependencies),
|
|
101
|
-
|
|
41
|
+
new TuitionFee(dependencies),
|
|
102
42
|
new Unfiltered(dependencies),
|
|
103
43
|
new Duration(dependencies),
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
44
|
+
new CountryAttendanceDegree(dependencies),
|
|
45
|
+
new CountryDegree(dependencies),
|
|
46
|
+
new CountryDuration(dependencies),
|
|
47
|
+
new CountryDurationDegree(dependencies),
|
|
48
|
+
new CountryEducationalForm(dependencies),
|
|
49
|
+
new CountryFormat(dependencies),
|
|
50
|
+
new CountryTuitionFee(dependencies),
|
|
111
51
|
new CountrySpecialProgrammes(dependencies),
|
|
112
|
-
|
|
52
|
+
new ContinentFormat(dependencies),
|
|
113
53
|
new ContinentSpecialProgrammes(dependencies),
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
54
|
+
new ContinentDuration(dependencies),
|
|
55
|
+
new DegreeAttendanceDiscipline(dependencies),
|
|
56
|
+
new DegreeCountryAttendance(dependencies),
|
|
57
|
+
new DegreeCountryDiscipline(dependencies),
|
|
58
|
+
new DegreeCountryTuitionFee(dependencies),
|
|
59
|
+
new DegreeFormat(dependencies),
|
|
60
|
+
new DegreeContinent(dependencies),
|
|
61
|
+
new DegreeAttendanceTuitionFee(dependencies),
|
|
62
|
+
new DegreeArea(dependencies),
|
|
63
|
+
new DegreeTuitionFee(dependencies),
|
|
64
|
+
new DegreeAreaTuitionFee(dependencies),
|
|
65
|
+
new DegreeContinentTuitionFee(dependencies),
|
|
66
|
+
new DegreeDuration(dependencies),
|
|
67
|
+
new DegreeFormatTuitionFee(dependencies),
|
|
68
|
+
new DegreeAttendanceFormat(dependencies),
|
|
69
|
+
new DegreeSpecialProgrammes(dependencies),
|
|
70
|
+
new DegreeAttendanceSpecialProgrammes(dependencies),
|
|
71
|
+
new Format(dependencies),
|
|
72
|
+
new DisciplineAttendance(dependencies),
|
|
73
|
+
new DisciplineContinent(dependencies),
|
|
74
|
+
new DisciplineCountry(dependencies),
|
|
75
|
+
new DisciplineCountryEducationalForm(dependencies),
|
|
76
|
+
new DisciplineDegree(dependencies),
|
|
137
77
|
new DisciplineDuration(dependencies),
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
78
|
+
new DisciplineEducationalForm(dependencies),
|
|
79
|
+
new DisciplineFormat(dependencies),
|
|
80
|
+
new DisciplineTuitionFee(dependencies),
|
|
81
|
+
new DisciplineTuitionFeeAttendance(dependencies),
|
|
82
|
+
new DisciplineContinentAttendance(dependencies),
|
|
83
|
+
new DisciplineCountryAttendance(dependencies),
|
|
84
|
+
new DisciplineCountryFormat(dependencies),
|
|
85
|
+
new DisciplineSpecialProgrammes(dependencies),
|
|
86
|
+
new AttendanceTuitionFee(dependencies),
|
|
87
|
+
new AttendanceFormat(dependencies),
|
|
88
|
+
new AttendanceArea(dependencies)
|
|
149
89
|
];
|
|
150
90
|
this.presenters.set(FilterKey.AREA, AreaPresenter.getInstance());
|
|
151
91
|
this.presenters.set(FilterKey.DELIVERY_METHOD, AttendancePresenter.getInstance());
|