@studyportals/fawkes 7.4.2-10 → 7.4.2-12

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

@@ -5,6 +5,7 @@ export declare enum FilterCombinations {
     COUNTRY = "country",
     DEGREE = "degree",
     DURATION = "duration",
+    FORMAT = "format",
     COUNTRY_DEGREE = "countryDegree",
     COUNTRY_DURATION = "countryDuration",
     COUNTRY_FORMAT = "countryFormat",

package/dist/src/enums/FilterCombinations.js

@@ -6,6 +6,7 @@ export var FilterCombinations;
     FilterCombinations["COUNTRY"] = "country";
     FilterCombinations["DEGREE"] = "degree";
     FilterCombinations["DURATION"] = "duration";
+    FilterCombinations["FORMAT"] = "format";
     FilterCombinations["COUNTRY_DEGREE"] = "countryDegree";
     FilterCombinations["COUNTRY_DURATION"] = "countryDuration";
     FilterCombinations["COUNTRY_FORMAT"] = "countryFormat";

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

@@ -8,7 +8,10 @@ export class Duration extends ProgrammesBaseIndexabilityPolicy {
     name = 'Duration Policy';
     description = 'Governs indexing of duration-level filtered pages. (1 year - 2 year)';
     filterKeys = [FilterKey.DURATION];
-    rules = [new SingleValueSelectedForFilterRule(FilterKey.DURATION), new OnlyFiltersSelectedRule([FilterKey.DURATION])];
+    rules = [
+        new SingleValueSelectedForFilterRule(FilterKey.DURATION),
+        new OnlyFiltersSelectedRule([FilterKey.DURATION])
+    ];
     constructor(dependencies) {
         super(dependencies);
         this.initateBaseRules();
@@ -17,11 +20,13 @@ export class Duration extends ProgrammesBaseIndexabilityPolicy {
         const durationFragments = DurationPresenter.getInstance().getFragments();
         const allowedDurationIds = [DurationFilterOptionValue.ONE_YEAR, DurationFilterOptionValue.TWO_YEARS];
         const allowedDurations = durationFragments.filter(duration => allowedDurationIds.includes(duration.id));
+        console.log("Allowed Durations are: " + allowedDurations.map(duration => duration.id).join(", ")); // eslint-disable-line
         const paths = [];
         for (const pageNumber of this.indexablePageNumbers) {
             for (const duration of allowedDurations) {
                 const filterKeyValues = new Map([[FilterKey.DURATION, [duration.id]]]);
                 const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                console.log("Checking duration: " + duration.id + " on page: " + pageNumber + " Result: " + result); // eslint-disable-line
                 if (result) {
                     paths.push(this.getPathWithPageNumber(duration.path, pageNumber));
                 }

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

@@ -20,13 +20,11 @@ export class Format extends ProgrammesBaseIndexabilityPolicy {
         const formatFragments = FormatPresenter.getInstance().getFragments();
         const allowedFormatIds = [FormatFilterOptionValue.PART_TIME, FormatFilterOptionValue.FULL_TIME];
         const allowedFormats = formatFragments.filter(format => allowedFormatIds.includes(format.id));
-        console.log("Allowed Formats are: " + allowedFormats.map(format => format.id).join(", ")); // eslint-disable-line
         const paths = [];
         for (const pageNumber of this.indexablePageNumbers) {
             for (const format of allowedFormats) {
                 const filterKeyValues = new Map([[FilterKey.ATTENDANCE, [format.id]]]);
                 const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
-                console.log("Checking format: " + format.id + " on page: " + pageNumber + " Result: " + result); // eslint-disable-line
                 if (result) {
                     paths.push(this.getPathWithPageNumber(format.path, pageNumber));
                 }
@@ -35,6 +33,6 @@ export class Format extends ProgrammesBaseIndexabilityPolicy {
         return paths;
     }
     get filterCombination() {
-        return FilterCombinations.ATTENDANCE;
+        return FilterCombinations.FORMAT;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@studyportals/fawkes",
-	"version": "7.4.2-10",
+	"version": "7.4.2-12",
 	"description": "A package to centralize SEO related logic for SBLP and Sitemap Generator.",
 	"files": [
 		"./dist"