@ordergroove/offers 2.27.3 → 2.27.6-alpha-PR-647-5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.27.3",
+  "version": "2.27.6-alpha-PR-647-5.2+4c726ce4",
   "description": "offer state component",
   "author": "Eugenio Lattanzio <eugenio63@gmail.com>",
   "homepage": "https://github.com/ordergroove/plush-toys#readme",
@@ -34,7 +34,7 @@
   ],
   "dependencies": {
     "@ordergroove/auth": "^2.3.0",
-    "@ordergroove/offers-live-editor": "^0.5.0",
+    "@ordergroove/offers-live-editor": "^0.6.0",
     "lit-element": "^2.1.0",
     "lodash.memoize": "^4.1.2",
     "logical-expression-parser": "1.0.0",
@@ -43,7 +43,7 @@
     "throttle-debounce": "^2.1.0"
   },
   "devDependencies": {
-    "@ordergroove/offers-templates": "^0.4.12"
+    "@ordergroove/offers-templates": "^0.4.13-alpha-PR-647-5.148+4c726ce4"
   },
-  "gitHead": "506e488aef1ca8a90dc56d9af659d5dafa0e51d8"
+  "gitHead": "4c726ce4839730891619b7233f1f17bc94f4f8d3"
 }

package/src/components/OptinSelect.js

@@ -5,6 +5,7 @@ import { OptinStatus, mapStateToProps as mapStateToPropsOptinStatus } from './Op
 import { mapStateToProps, frequencyText } from './FrequencyStatus';
 import { connect } from '../core/connect';
 import { defaultFrequency } from '../core/props';
+import { configSelector } from '../core/selectors';
 
 export class OptinSelect extends withChildOptions(OptinStatus) {
   static get properties() {
@@ -30,8 +31,14 @@ export class OptinSelect extends withChildOptions(OptinStatus) {
     `;
   }
 
-  get isSelected() {
-    return this.subscribed ? this.frequency : 'optedOut';
+  get currentFrequency() {
+    if (!this.subscribed) {
+      return 'optedOut';
+    }
+    if (this.frequency) {
+      return this.frequency;
+    }
+    return this.defaultFrequency;
   }
 
   onOptinChange(value) {
@@ -43,27 +50,27 @@ export class OptinSelect extends withChildOptions(OptinStatus) {
   }
 
   render() {
-    const { options: childOptions, isSelected } = this.childOptions;
-    let options = childOptions;
-    if (!childOptions.length) {
+    const { options: childOptions } = this.childOptions;
+    let options;
+    if (this.frequencies?.length) {
       options = [
-        {
-          value: 'optedOut',
-          text: html`
-            <og-text key="offerOptOutLabel"></og-text>
-          `
-        },
-        ...(this.frequencies || []).map(value => ({
+        ...([childOptions.find(option => option.value === 'optedOut')] || []),
+        ...this.frequencies.map((value, ix) => ({
           value,
-          text: frequencyText(value, this.defaultFrequency)
+          text:
+            this.frequenciesText && ix in this.frequenciesText
+              ? this.frequenciesText[ix]
+              : frequencyText(value, this.defaultFrequency)
         }))
       ];
+    } else {
+      options = childOptions;
     }
 
     return html`
       <og-select
         .options="${options}"
-        .selected="${isSelected}"
+        .selected="${this.currentFrequency}"
         .onChange="${({ target: { value } }) => this.onOptinChange(value)}"
       ></og-select>
     `;
@@ -73,7 +80,8 @@ export class OptinSelect extends withChildOptions(OptinStatus) {
 export const ConnectedOptinSelect = connect(
   (state, ownProps) => ({
     ...mapStateToPropsOptinStatus(state, ownProps),
-    ...mapStateToProps(state, ownProps)
+    ...mapStateToProps(state, ownProps),
+    ...configSelector(state, ownProps, 'frequencies')
   }),
   { productChangeFrequency, optoutProduct }
 )(OptinSelect);

package/src/make-api.js

@@ -189,7 +189,7 @@ export default function makeApi(store) {
   Object.assign(window.OG, offers);
   Object.assign(offers.initialize, offers);
 
-  offersLiveEditor();
+  offersLiveEditor(window.opener, offers);
 
   return offers;
 }