@studyportals/fawkes 9.0.1-2 → 9.0.1-4

package/dist/src/scholarships/rules/OnlyCountriesDisciplineCountryRule.d.ts

@@ -4,7 +4,6 @@ import { FilterKeyValuesMap } from "../../../sitemap-generator-seo";
 export declare class OnlyCountriesDisciplineCountryRule implements IRule {
     private readonly countryFilterKey;
     private readonly allowedCountryIsos;
-    private allowedCountryIds?;
     getName(): string;
     forSearch(dependencies: ISearchDependencies): Promise<boolean>;
     forSitemapGenerator(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;

package/dist/src/scholarships/rules/OnlyCountriesDisciplineCountryRule.js

@@ -3,20 +3,20 @@ import { CountryPresenter } from "../../presenters/CountryPresenter";
 export class OnlyCountriesDisciplineCountryRule {
     countryFilterKey = FilterKey.COUNTRY;
     allowedCountryIsos = ['AU', 'CA', 'CN', 'FR', 'DE', 'IN', 'IE', 'IT', 'JP', 'MY', 'NL', 'NZ', 'SG', 'KR', 'CH', 'GB', 'US'];
-    allowedCountryIds;
     getName() {
         return 'OnlyCountriesDisciplineCountryRule';
     }
     forSearch(dependencies) {
         //eslint-disable-next-line no-console
-        console.log('dependencies', dependencies.filterState);
+        console.log('dependencies', dependencies.filterState.getSelectedValuesFor(this.countryFilterKey));
         const selectedCountry = dependencies.seoInfoBase.getFilterOptionValueBy(this.countryFilterKey, dependencies.filterState);
-        //eslint-disable-next-line no-console
-        console.log('selectedCountry', selectedCountry);
         if (!selectedCountry) {
             return Promise.resolve(false);
         }
-        return Promise.resolve(this.getAllowedCountryIds().has(selectedCountry));
+        const allowedCountryIds = this.getAllowedCountryIds();
+        //eslint-disable-next-line no-console
+        console.log('allowed country ids', Array.from(allowedCountryIds));
+        return Promise.resolve(allowedCountryIds.has(selectedCountry));
     }
     forSitemapGenerator(filterKeyValues) {
         const selectedCountries = filterKeyValues.get(FilterKey.COUNTRY);
@@ -30,13 +30,10 @@ export class OnlyCountriesDisciplineCountryRule {
         return Promise.resolve(this.getAllowedCountryIds().has(selectedCountry));
     }
     getAllowedCountryIds() {
-        if (!this.allowedCountryIds) {
-            this.allowedCountryIds = new Set(CountryPresenter.getInstance()
-                .getFragments()
-                .filter((country) => this.allowedCountryIsos.includes(country.iso))
-                .map((country) => country.id));
-        }
-        return this.allowedCountryIds;
+        return new Set(CountryPresenter.getInstance()
+            .getFragments()
+            .filter((country) => this.allowedCountryIsos.includes(country.iso))
+            .map((country) => country.id));
     }
     getDescription() {
         return 'Country is one of the allowed countries for discipline and country pages';

package/package.json

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