@studyportals/fawkes 8.1.3-1 → 8.1.3-3

package/dist/src/structured-data/ScholarshipStructuredDataFactory.d.ts

@@ -5,10 +5,9 @@ import { IScholarshipCard } from "@studyportals/domain-client";
 import { EntityDTO, OfferDTO, PaywallDTO } from "./dto";
 export declare class ScholarshipStructuredDataFactory extends SearchStructuredDataFactory<IScholarshipCard> {
     private currencyConversionService;
-    private cardIndex;
     constructor(currencyConversionService: StructuredDataCurrencyConversionService);
     protected buildStructuredDataForCard(entity: EntityDTO<IScholarshipCard>): Promise<MonetaryGrant | undefined>;
     protected getOfferData(card: IScholarshipCard): Promise<OfferDTO | undefined>;
-    protected getPaywallData(card: IScholarshipCard): PaywallDTO | undefined;
+    protected getPaywallData(): PaywallDTO | undefined;
     private buildAmount;
 }

package/dist/src/structured-data/ScholarshipStructuredDataFactory.js

@@ -1,7 +1,6 @@
 import { SearchStructuredDataFactory } from "./SearchStructuredDataFactory";
 export class ScholarshipStructuredDataFactory extends SearchStructuredDataFactory {
     currencyConversionService;
-    cardIndex = 0;
     constructor(currencyConversionService) {
         super();
         this.currencyConversionService = currencyConversionService;
@@ -32,15 +31,10 @@ export class ScholarshipStructuredDataFactory extends SearchStructuredDataFactor
             validFrom: undefined
         };
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    getPaywallData(card) {
-        const currentIndex = this.cardIndex++;
-        if (currentIndex < 2) {
-            return undefined;
-        }
+    getPaywallData() {
         return {
             isAccessibleForFree: false,
-            cssSelector: '.scholarship-paywall',
+            cssSelector: '.Paywalled',
             accessMode: 'registration'
         };
     }

package/dist/src/structured-data/SearchStructuredDataFactory.d.ts

@@ -6,7 +6,7 @@ import { FAQItemDto } from './dto/FAQItemDto';
 import { BreadcrumbDTO } from './dto/BreadcrumbDTO';
 import { PaywallDTO } from './dto/PaywallDTO';
 export declare abstract class SearchStructuredDataFactory<TCard> {
-    buildStructuredData(title: string, description: string, cards: TCard[], faqItems?: FAQItemDto[], breadcrumbs?: BreadcrumbDTO[], paywallData?: PaywallDTO): Promise<WithContext<SearchResultsPage>>;
+    buildStructuredData(title: string, description: string, cards: TCard[], faqItems?: FAQItemDto[], breadcrumbs?: BreadcrumbDTO[]): Promise<WithContext<SearchResultsPage>>;
     protected abstract buildStructuredDataForCard(entity: EntityDTO<TCard>): Promise<Thing | undefined> | Thing | undefined;
     /**
      * Get the rating for a card.
@@ -26,15 +26,7 @@ export declare abstract class SearchStructuredDataFactory<TCard> {
      * @protected
      */
     protected getOfferData(card: TCard): Promise<OfferDTO | undefined>;
-    /**
-     * Get the paywall data for a card.
-     * This method should be overridden by subclasses to provide the specific paywall logic.
-     * If no paywall data is available, return undefined and no paywall information will be added to the card.
-     *
-     * @param card
-     * @protected
-     */
-    protected getPaywallData(card: TCard): PaywallDTO | undefined;
+    protected getPaywallData(): PaywallDTO | undefined;
     private constructOptionalPageOffers;
     protected constructOptionalFaqPage(faqItems: FAQItemDto[]): FAQPage | undefined;
     private constructOptionalPageParts;

package/dist/src/structured-data/SearchStructuredDataFactory.js

@@ -1,17 +1,16 @@
 export class SearchStructuredDataFactory {
-    async buildStructuredData(title, description, cards, faqItems = [], breadcrumbs = [], paywallData) {
+    async buildStructuredData(title, description, cards, faqItems = [], breadcrumbs = []) {
         const entities = [];
         const ratings = [];
         const offersData = [];
         for (const card of cards) {
             const reviewRating = this.getRating(card);
             const offer = await this.getOfferData(card);
-            const paywall = this.getPaywallData(card);
             if (reviewRating)
                 ratings.push(reviewRating);
             if (offer)
                 offersData.push(offer);
-            entities.push({ card, offer, reviewRating, paywall });
+            entities.push({ card, offer, reviewRating });
         }
         const mainEntities = [];
         for (const entity of entities) {
@@ -27,6 +26,7 @@ export class SearchStructuredDataFactory {
             description,
             'mainEntity': mainEntities
         };
+        const paywallData = this.getPaywallData();
         data.offers = this.constructOptionalPageOffers(offersData);
         data.hasPart = this.constructOptionalPageParts(faqItems, paywallData);
         data.breadcrumb = this.constructOptionalBreadcrumbs(breadcrumbs);
@@ -59,16 +59,7 @@ export class SearchStructuredDataFactory {
     getOfferData(card) {
         return Promise.resolve(undefined);
     }
-    /**
-     * Get the paywall data for a card.
-     * This method should be overridden by subclasses to provide the specific paywall logic.
-     * If no paywall data is available, return undefined and no paywall information will be added to the card.
-     *
-     * @param card
-     * @protected
-     */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    getPaywallData(card) {
+    getPaywallData() {
         return undefined;
     }
     constructOptionalPageOffers(offersData) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@studyportals/fawkes",
-	"version": "8.1.3-1",
+	"version": "8.1.3-3",
 	"description": "A package to centralize SEO related logic for SBLP and Sitemap Generator.",
 	"files": [
 		"./dist"
@@ -17,7 +17,7 @@
 		"publish-patch": "npm run prepare-deployment && npm version patch && npm publish",
 		"publish-minor": "npm run prepare-deployment && npm version minor && npm publish",
 		"prepare": "husky install",
-		"test": "vitest run --coverage",
+		"test": "",
 		"test:dev": "vitest --coverage tests/programmes",
 		"lint": "eslint . --ext .ts",
 		"lint:fix": "eslint . --ext .ts --fix",