Use settings on MailPoet object rather than on Window
[MAILPOET-3763]
This commit is contained in:
@@ -24,6 +24,7 @@ var MailPoet = {
|
|||||||
wpWeekStartsOn: window.mailpoet_wp_week_starts_on,
|
wpWeekStartsOn: window.mailpoet_wp_week_starts_on,
|
||||||
subscribersCountsCacheCreatedAt: window.mailpoet_subscribers_counts_cache_created_at,
|
subscribersCountsCacheCreatedAt: window.mailpoet_subscribers_counts_cache_created_at,
|
||||||
getShortcodeLinks: () => (window.mailpoet_shortcode_links ? window.mailpoet_shortcode_links : []),
|
getShortcodeLinks: () => (window.mailpoet_shortcode_links ? window.mailpoet_shortcode_links : []),
|
||||||
|
settings: window.settings,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Expose MailPoet globally
|
// Expose MailPoet globally
|
||||||
|
@@ -1,19 +1,11 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import MailPoet from 'mailpoet';
|
|
||||||
import { assoc, find, map } from 'lodash/fp';
|
import { assoc, find, map } from 'lodash/fp';
|
||||||
|
|
||||||
|
import MailPoet from 'mailpoet';
|
||||||
import { Scheduling } from '../types/re_engagement/scheduling';
|
import { Scheduling } from '../types/re_engagement/scheduling';
|
||||||
import GATrackingField from './ga_tracking';
|
import GATrackingField from './ga_tracking';
|
||||||
import SenderField from './sender_address_field';
|
import SenderField from './sender_address_field';
|
||||||
|
|
||||||
interface ReengagementWindow extends Window {
|
|
||||||
settings: {
|
|
||||||
deactivate_subscriber_after_inactive_days: string;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
declare let window: ReengagementWindow;
|
|
||||||
|
|
||||||
interface onValueChangeParam {
|
interface onValueChangeParam {
|
||||||
target: {
|
target: {
|
||||||
name: string,
|
name: string,
|
||||||
@@ -40,7 +32,7 @@ function FormReEngagementScheduling(props: Props): JSX.Element {
|
|||||||
afterTimeNumber={props.item.options.afterTimeNumber.toString()}
|
afterTimeNumber={props.item.options.afterTimeNumber.toString()}
|
||||||
afterTimeType={props.item.options.afterTimeType}
|
afterTimeType={props.item.options.afterTimeType}
|
||||||
inactiveSubscribersPeriod={
|
inactiveSubscribersPeriod={
|
||||||
Number(window.settings.deactivate_subscriber_after_inactive_days)
|
Number(MailPoet.settings.deactivate_subscriber_after_inactive_days)
|
||||||
}
|
}
|
||||||
updateAfterTimeNumber={(value) => {
|
updateAfterTimeNumber={(value) => {
|
||||||
props.onValueChange({
|
props.onValueChange({
|
||||||
|
@@ -11,18 +11,10 @@ import APIErrorsNotice from 'notices/api_errors_notice';
|
|||||||
import { Scheduling } from './scheduling';
|
import { Scheduling } from './scheduling';
|
||||||
import ListingHeadingStepsRoute from '../../listings/heading_steps_route';
|
import ListingHeadingStepsRoute from '../../listings/heading_steps_route';
|
||||||
|
|
||||||
interface ReengagementWindow extends Window {
|
|
||||||
settings: {
|
|
||||||
deactivate_subscriber_after_inactive_days: string;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
declare let window: ReengagementWindow;
|
|
||||||
|
|
||||||
export function NewsletterTypeReEngagement(): JSX.Element {
|
export function NewsletterTypeReEngagement(): JSX.Element {
|
||||||
const [options, setOptions] = useState({
|
const [options, setOptions] = useState({
|
||||||
afterTimeNumber: (
|
afterTimeNumber: (
|
||||||
(Number(window.settings.deactivate_subscriber_after_inactive_days) / 30) - 1
|
(Number(MailPoet.settings.deactivate_subscriber_after_inactive_days) / 30) - 1
|
||||||
).toString(),
|
).toString(),
|
||||||
afterTimeType: 'months',
|
afterTimeType: 'months',
|
||||||
});
|
});
|
||||||
@@ -66,7 +58,7 @@ export function NewsletterTypeReEngagement(): JSX.Element {
|
|||||||
afterTimeNumber={options.afterTimeNumber}
|
afterTimeNumber={options.afterTimeNumber}
|
||||||
afterTimeType={options.afterTimeType}
|
afterTimeType={options.afterTimeType}
|
||||||
inactiveSubscribersPeriod={
|
inactiveSubscribersPeriod={
|
||||||
Number(window.settings.deactivate_subscriber_after_inactive_days)
|
Number(MailPoet.settings.deactivate_subscriber_after_inactive_days)
|
||||||
}
|
}
|
||||||
updateAfterTimeNumber={compose([setOptions, assoc('afterTimeNumber', __, options)])}
|
updateAfterTimeNumber={compose([setOptions, assoc('afterTimeNumber', __, options)])}
|
||||||
updateAfterTimeType={compose([setOptions, assoc('afterTimeType', __, options)])}
|
updateAfterTimeType={compose([setOptions, assoc('afterTimeType', __, options)])}
|
||||||
|
Reference in New Issue
Block a user