@everymatrix/user-action-controller 1.34.0 → 1.35.0

package/dist/collection/components/user-action-controller/user-action-controller.js

@@ -34,13 +34,14 @@ export class UserActionController {
     this.limitStylingAppends = false;
     this.isLoading = true;
     this.mandatoryActionsChecked = 0;
-    //for now this variable is hardcoded bcs we have only terms and conditions mandatory and we dont receive with these new functionality the mandatory actions
-    this.mandatoryActions = ['termsandconditions'];
+    //for now this variable is hardcoded bcs we have terms and conditions and privacy policy mandatory and we dont receive with these new functionality the mandatory actions
+    this.mandatoryActions = ['termsandconditions', 'privacypolicy'];
     this.userActions = [];
     this.consentTitles = {
       termsandconditions: translate('termsandconditions', this.lang),
       sms: translate('sms', this.lang),
-      emailmarketing: translate('emailmarketing', this.lang)
+      emailmarketing: translate('emailmarketing', this.lang),
+      privacypolicy: translate('privacypolicy', this.lang)
     };
     this.setClientStyling = () => {
       let sheet = document.createElement('style');
@@ -82,56 +83,62 @@ export class UserActionController {
       this.receivedQueryResponses++;
     }
   }
-  determineUserActions() {
+  determineUserActionsCore() {
     const url = new URL(`${this.endpoint}/v1/player/${this.userId}/consent`);
     const headers = new Headers();
     headers.append('X-SessionId', this.userSession);
-    let requestOptions;
-    requestOptions = {
+    let requestOptions = {
       method: 'GET',
       headers
     };
-    if (url && requestOptions) {
-      return fetch(url.href, requestOptions)
-        .then(res => res.json())
-        .then(data => {
-        const actionItems = data.items;
-        actionItems.forEach(element => {
-          if (element.status === 'Expired') {
-            this.activeUserActions.push(element.tagCode);
-          }
-        });
-        this.isLoading = false;
-      })
-        .catch(error => {
-        console.error('Error fetching data:', error);
-        this.isLoading = false;
+    return fetch(url.href, requestOptions)
+      .then(res => res.json())
+      .then(data => {
+      const actionItems = data.items;
+      actionItems.forEach(element => {
+        if (element.status === 'Expired') {
+          this.activeUserActions.push(element.tagCode);
+        }
       });
-    }
-    else {
-      return Promise.reject('Unsupported endpoint');
-    }
+      this.isLoading = false;
+    })
+      .catch(error => {
+      console.error('Error fetching data:', error);
+      this.isLoading = false;
+    });
+  }
+  determineUserActions16() {
+    const url = new URL(`${this.endpoint}/v1/player/${this.userId}/legislation/consents`);
+    const headers = new Headers();
+    headers.append('X-SessionId', this.userSession);
+    let requestOptions = {
+      method: 'GET',
+      headers
+    };
+    return fetch(url.href, requestOptions)
+      .then(res => res.json())
+      .then(data => {
+      const actionItems = data.consents;
+      actionItems.forEach(element => {
+        if (element.status === 2) {
+          this.activeUserActions.push(element.tagCode);
+        }
+      });
+      this.isLoading = false;
+    })
+      .catch(error => {
+      console.error('Error fetching data:', error);
+      this.isLoading = false;
+    });
   }
   updateUserConsents() {
-    let url;
-    let requestOptions;
-    url = (this.gmVersion === 'gmcore')
+    const url = (this.gmVersion === 'gmcore')
       ? new URL(`${this.endpoint}/v1/player/${this.userId}/consent`)
       : new URL(`${this.endpoint}/v1/player/${this.userId}/legislation/consents`);
-    const body = (this.gmVersion === 'gmcore')
-      ? {
-        items: this.userActions
-      }
-      : {
-        consents: [
-          {
-            tagCode: "termsandconditions",
-            note: "",
-            status: 1
-          }
-        ]
-      };
-    requestOptions = {
+    const body = {
+      items: this.userActions
+    };
+    let requestOptions = {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
@@ -140,43 +147,40 @@ export class UserActionController {
       },
       body: JSON.stringify(body)
     };
-    if (url && requestOptions) {
-      fetch(url.href, requestOptions)
-        .then(res => res.json())
-        .then(() => {
-        window.postMessage({
-          type: 'WidgetNotification',
-          data: {
-            type: 'success',
-            message: 'Consent update successful!'
-          }
-        }, window.location.href);
-      })
-        .catch((err) => {
-        window.postMessage({
-          type: 'WidgetNotification',
-          data: {
-            type: 'error',
-            message: 'Server might not be responding',
-            err
-          }
-        }, window.location.href);
-      })
-        .finally(() => {
-        window.postMessage({ type: 'UserActionsCompleted' }, window.location.href);
-      });
-    }
+    fetch(url.href, requestOptions)
+      .then(res => res.json())
+      .then(() => {
+      window.postMessage({
+        type: 'WidgetNotification',
+        data: {
+          type: 'success',
+          message: 'Consent update successful!'
+        }
+      }, window.location.href);
+    })
+      .catch((err) => {
+      window.postMessage({
+        type: 'WidgetNotification',
+        data: {
+          type: 'error',
+          message: 'Server might not be responding',
+          err
+        }
+      }, window.location.href);
+    })
+      .finally(() => {
+      window.postMessage({ type: 'UserActionsCompleted' }, window.location.href);
+    });
   }
   handleApplyClick() {
     this.queryFired = true;
   }
   async componentWillLoad() {
     if (this.gmVersion === 'gmcore') {
-      return this.determineUserActions();
+      this.determineUserActionsCore();
     }
-    else {
-      this.activeUserActions = ['termsandconditions'];
-      this.isLoading = false;
+    if (this.gmVersion === 'gm16') {
+      this.determineUserActions16();
     }
     if (this.translationUrl.length > 2) {
       await getTranslations(this.translationUrl);
@@ -194,22 +198,24 @@ export class UserActionController {
     // end custom styling area
   }
   render() {
-    const isMandatoryPresent = this.mandatoryActions.every(action => this.activeUserActions.includes(action));
-    if (isMandatoryPresent) {
-      this.userActionsValidated = !(this.mandatoryActionsChecked === this.mandatoryActions.length);
-    }
-    else {
-      this.userActionsValidated = false;
-    }
+    let mandatoryItems = 0;
+    const isMandatoryPresent = this.mandatoryActions.some(action => {
+      const isPresent = this.activeUserActions.includes(action);
+      if (isPresent) {
+        mandatoryItems++;
+      }
+      return isPresent;
+    });
+    this.userActionsValidated = isMandatoryPresent && (this.mandatoryActionsChecked === mandatoryItems);
     return (h("div", { class: "QueryReferenceContainer", ref: el => this.stylingContainer = el }, this.isLoading ? (h("slot", { name: 'spinner' })
       &&
         h("svg", { class: "spinner", viewBox: "0 0 50 50" },
           h("circle", { class: "path", cx: "25", cy: "25", r: "20", fill: "none", "stroke-width": "5" }))) : (h("div", { class: "UserActionController" },
       h("h2", { class: "UserConsentNotice" }, this.userNoticeText),
       h("div", { class: "PlayerLegislationWrapper" }, this.activeUserActions.map(action => (h("slot", { name: action },
-        h("player-user-consents", { lang: this.lang, "translation-url": this.translationUrl, slot: action, consentType: action, consentTitle: this.consentTitles[action], queried: this.queryFired, mandatory: this.mandatoryActions.includes(action), "client-styling": this.clientStyling }))))),
+        h("player-user-consents", { lang: this.lang, "gm-version": this.gmVersion, "translation-url": this.translationUrl, slot: action, consentType: action, consentTitle: this.consentTitles[action], queried: this.queryFired, mandatory: this.mandatoryActions.includes(action), "client-styling": this.clientStyling }))))),
       this.includeSubmitButton &&
-        h("button", { class: "ConsentSubmitButton", disabled: this.userActionsValidated, onClick: () => this.handleApplyClick() }, this.submitButtonText)))));
+        h("button", { class: "ConsentSubmitButton", disabled: !this.userActionsValidated, onClick: () => this.handleApplyClick() }, this.submitButtonText)))));
   }
   static get is() { return "user-action-controller"; }
   static get encapsulation() { return "shadow"; }

package/dist/collection/utils/locale.utils.js

@@ -4,32 +4,38 @@ const TRANSLATIONS = {
   en: {
     termsandconditions: 'Terms and Conditions',
     sms: 'SMS marketing',
-    emailmarketing: 'Email marketing'
+    emailmarketing: 'Email marketing',
+    privacypolicy: 'Privacy Policy'
   },
   ro: {
     termsandconditions: 'Termeni şi condiţii',
     sms: 'SMS marketing',
-    emailmarketing: 'Email marketing'
+    emailmarketing: 'Email marketing',
+    privacypolicy: 'Privacy Policy'
   },
   hr: {
     termsandconditions: 'Terms and Conditions',
     sms: 'SMS marketing',
-    emailmarketing: 'Email marketing'
+    emailmarketing: 'Email marketing',
+    privacypolicy: 'Privacy Policy'
   },
   fr: {
     termsandconditions: 'Terms and Conditions',
     sms: 'SMS marketing',
-    emailmarketing: 'Email marketing'
+    emailmarketing: 'Email marketing',
+    privacypolicy: 'Privacy Policy'
   },
   cs: {
     termsandconditions: 'Terms and Conditions',
     sms: 'SMS marketing',
-    emailmarketing: 'Email marketing'
+    emailmarketing: 'Email marketing',
+    privacypolicy: 'Privacy Policy'
   },
   de: {
     termsandconditions: 'Terms and Conditions',
     sms: 'SMS marketing',
-    emailmarketing: 'Email marketing'
+    emailmarketing: 'Email marketing',
+    privacypolicy: 'Privacy Policy'
   },
 };
 export const getTranslations = (url) => {

package/dist/components/player-user-consents2.js

@@ -3,58 +3,94 @@ import { proxyCustomElement, HTMLElement, createEvent, h } from '@stencil/core/i
 const DEFAULT_LANGUAGE = 'en';
 const TRANSLATIONS = {
   en: {
-    termsandconditions1: "I accept the ",
-    termsandconditions2: ", I have read and understood the ",
-    termsandconditions3: " as published on this site and confirm that I am over 18 years old.",
-    tc: "Terms and Conditions",
-    privacy: "Privacy Policy",
+    termsAndConditions: {
+      acceptPart1: "I accept the ",
+      acceptPart2: ", I have read and understood the ",
+      acceptPart3: " as published on this site and confirm that I am over 18 years old.",
+      tc: "Terms and Conditions"
+    },
+    privacyPolicy: {
+      readUnderstandPart1: "I have read and understood the ",
+      readUnderstandPart2: ", as published on this site and confirm that I am over 18 years old.",
+      privacy: "Privacy Policy"
+    },
     sms: "I consent to receive marketing communication via SMS.",
-    emailmarketing: "I consent to receive marketing communication via Email."
+    email: "I consent to receive marketing communication via Email."
   },
   ro: {
-    termsandconditions1: "Accept ",
-    termsandconditions2: " platformei. Am citit şi înţeles ",
-    termsandconditions3: " publicată pe acest site şi confirm că am vârstă peste 18 ani.",
-    tc: "Termenii şi condiţiile",
-    privacy: "Politica de confidenţialitate",
+    termsAndConditions: {
+      acceptPart1: "Accept ",
+      acceptPart2: " platformei. Am citit şi înţeles ",
+      acceptPart3: " publicată pe acest site şi confirm că am vârstă peste 18 ani.",
+      tc: "Termenii şi condiţiile"
+    },
+    privacyPolicy: {
+      readUnderstandPart1: "Am citit şi înţeles ",
+      readUnderstandPart2: " publicată pe acest site şi confirm că am vârstă peste 18 ani.",
+      privacy: "Politica de confidenţialitate"
+    },
     sms: "Sunt de acord să primesc promoţii de marketing prin SMS.",
-    emailmarketing: "Sunt de acord să primesc promoţii de marketing pe e-mail."
+    email: "Sunt de acord să primesc promoţii de marketing pe e-mail."
   },
   hr: {
-    termsandconditions1: "I accept the ",
-    termsandconditions2: ", I have read and understood the ",
-    termsandconditions3: " as published on this site and confirm that I am over 18 years old.",
-    tc: "Terms and Conditions",
-    privacy: "Privacy Policy",
+    termsAndConditions: {
+      acceptPart1: "I accept the ",
+      acceptPart2: ", I have read and understood the ",
+      acceptPart3: " as published on this site and confirm that I am over 18 years old.",
+      tc: "Terms and Conditions"
+    },
+    privacyPolicy: {
+      readUnderstandPart1: "I have read and understood the ",
+      readUnderstandPart2: ", as published on this site and confirm that I am over 18 years old.",
+      privacy: "Privacy Policy"
+    },
     sms: "I consent to receive marketing communication via SMS.",
-    emailmarketing: "I consent to receive marketing communication via Email."
+    email: "I consent to receive marketing communication via Email."
   },
   fr: {
-    termsandconditions1: "I accept the ",
-    termsandconditions2: ", I have read and understood the ",
-    termsandconditions3: " as published on this site and confirm that I am over 18 years old.",
-    tc: "Terms and Conditions",
-    privacy: "Privacy Policy",
+    termsAndConditions: {
+      acceptPart1: "I accept the ",
+      acceptPart2: ", I have read and understood the ",
+      acceptPart3: " as published on this site and confirm that I am over 18 years old.",
+      tc: "Terms and Conditions"
+    },
+    privacyPolicy: {
+      readUnderstandPart1: "I have read and understood the ",
+      readUnderstandPart2: ", as published on this site and confirm that I am over 18 years old.",
+      privacy: "Privacy Policy"
+    },
     sms: "I consent to receive marketing communication via SMS.",
-    emailmarketing: "I consent to receive marketing communication via Email."
+    email: "I consent to receive marketing communication via Email."
   },
   cs: {
-    termsandconditions1: "I accept the ",
-    termsandconditions2: ", I have read and understood the ",
-    termsandconditions3: " as published on this site and confirm that I am over 18 years old.",
-    tc: "Terms and Conditions",
-    privacy: "Privacy Policy",
+    termsAndConditions: {
+      acceptPart1: "I accept the ",
+      acceptPart2: ", I have read and understood the ",
+      acceptPart3: " as published on this site and confirm that I am over 18 years old.",
+      tc: "Terms and Conditions"
+    },
+    privacyPolicy: {
+      readUnderstandPart1: "I have read and understood the ",
+      readUnderstandPart2: ", as published on this site and confirm that I am over 18 years old.",
+      privacy: "Privacy Policy"
+    },
     sms: "I consent to receive marketing communication via SMS.",
-    emailmarketing: "I consent to receive marketing communication via Email."
+    email: "I consent to receive marketing communication via Email."
   },
   de: {
-    termsandconditions1: "I accept the ",
-    termsandconditions2: ", I have read and understood the ",
-    termsandconditions3: " as published on this site and confirm that I am over 18 years old.",
-    tc: "Terms and Conditions",
-    privacy: "Privacy Policy",
+    termsAndConditions: {
+      acceptPart1: "I accept the ",
+      acceptPart2: ", I have read and understood the ",
+      acceptPart3: " as published on this site and confirm that I am over 18 years old.",
+      tc: "Terms and Conditions"
+    },
+    privacyPolicy: {
+      readUnderstandPart1: "I have read and understood the ",
+      readUnderstandPart2: ", as published on this site and confirm that I am over 18 years old.",
+      privacy: "Privacy Policy"
+    },
     sms: "I consent to receive marketing communication via SMS.",
-    emailmarketing: "I consent to receive marketing communication via Email."
+    email: "I consent to receive marketing communication via Email."
   },
 };
 const getTranslations = (url) => {
@@ -73,12 +109,18 @@ const getTranslations = (url) => {
   });
 };
 const translate = (key, customLang, values) => {
-  const lang = customLang;
-  let translation = TRANSLATIONS[lang !== undefined ? lang : DEFAULT_LANGUAGE][key];
+  const lang = customLang || DEFAULT_LANGUAGE;
+  const getNestedTranslation = (obj, path) => {
+    return path.split('.').reduce((o, k) => (o && o[k] !== undefined ? o[k] : null), obj);
+  };
+  let translation = getNestedTranslation(TRANSLATIONS[lang], key);
+  if (translation === null) {
+    return key;
+  }
   if (values !== undefined) {
-    for (const [key, value] of Object.entries(values.values)) {
-      const regex = new RegExp(`{${key}}`, 'g');
-      translation = translation.replace(regex, value);
+    for (const [k, v] of Object.entries(values)) {
+      const regex = new RegExp(`{${k}}`, 'g');
+      translation = translation.replace(regex, v);
     }
   }
   return translation;
@@ -108,6 +150,10 @@ const PlayerUserConsents = /*@__PURE__*/ proxyCustomElement(class extends HTMLEl
      * wether or not this consent is mandatory. Used for render details
      */
     this.mandatory = false;
+    /**
+     * Select GM version
+     */
+    this.gmVersion = '';
     /**
      * the title of the consent to be displayed
      */
@@ -157,9 +203,20 @@ const PlayerUserConsents = /*@__PURE__*/ proxyCustomElement(class extends HTMLEl
     // end custom styling area
   }
   determineTextContent() {
-    return this.consentType === 'termsandconditions' ?
-      h("p", null, translate('termsandconditions1', this.lang), h("span", { class: "ConsentLink", onClick: this.goToTermsAndConditions }, translate('tc', this.lang)), translate('termsandconditions2', this.lang), h("span", { class: "ConsentLink", onClick: this.goToPrivacyPolicy }, translate('privacy', this.lang)), translate('termsandconditions3', this.lang))
-      : h("p", null, translate(this.consentType, this.lang));
+    if (this.gmVersion === 'gmcore') {
+      if (this.consentType === 'termsandconditions') {
+        return h("p", null, translate('termsAndConditions.acceptPart1', this.lang), h("span", { class: "ConsentLink", onClick: this.goToTermsAndConditions }, translate('termsAndConditions.tc', this.lang)), translate('termsAndConditions.acceptPart2', this.lang), h("span", { class: "ConsentLink", onClick: this.goToPrivacyPolicy }, translate('privacyPolicy.privacy', this.lang)), translate('termsAndConditions.acceptPart3', this.lang));
+      }
+    }
+    if (this.gmVersion === 'gm16') {
+      if (this.consentType === 'termsandconditions') {
+        return h("p", null, translate('termsAndConditions.acceptPart1', this.lang), h("span", { class: "ConsentLink", onClick: this.goToTermsAndConditions }, translate('termsAndConditions.tc', this.lang)));
+      }
+      if (this.consentType === 'privacypolicy') {
+        return h("p", null, translate('privacyPolicy.readUnderstandPart1', this.lang), h("span", { class: "ConsentLink", onClick: this.goToPrivacyPolicy }, translate('privacyPolicy.privacy', this.lang)), translate('privacyPolicy.readUnderstandPart2', this.lang));
+      }
+    }
+    return h("p", null, translate(this.consentType, this.lang));
   }
   render() {
     if (this.queried) {
@@ -176,6 +233,7 @@ const PlayerUserConsents = /*@__PURE__*/ proxyCustomElement(class extends HTMLEl
     "queried": [516],
     "consentType": [513, "consent-type"],
     "mandatory": [516],
+    "gmVersion": [1, "gm-version"],
     "consentTitle": [513, "consent-title"],
     "clientStyling": [1, "client-styling"],
     "translationUrl": [513, "translation-url"],