From d0e4ed389225f65d898e522c0440d8c65d2f10e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lys=C3=BD?= Date: Tue, 21 Sep 2021 10:57:31 +0200 Subject: [PATCH] Remove mailpoet pages from the 'After submit' option [MAILPOET-3675] --- assets/js/src/form_editor/store/selectors.jsx | 7 +------ assets/js/src/form_editor/store/store.jsx | 1 - lib/AdminPages/Pages/FormEditor.php | 1 - views/form/editor.html | 1 - 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/assets/js/src/form_editor/store/selectors.jsx b/assets/js/src/form_editor/store/selectors.jsx index 33c01f6933..c8ead54ae1 100644 --- a/assets/js/src/form_editor/store/selectors.jsx +++ b/assets/js/src/form_editor/store/selectors.jsx @@ -53,15 +53,10 @@ export default { return state.customFields; }, getAllAvailablePages(state) { - const allWPPages = state.allWpPages.map((page) => ({ + return state.allWpPages.map((page) => ({ id: page.id, title: page.name, })); - const mailpoetPages = state.mailpoetPages.map((page) => ({ - id: page.ID, - title: page.post_title, - })); - return mailpoetPages.concat(allWPPages); }, getIsFormSaving(state) { return state.isFormSaving; diff --git a/assets/js/src/form_editor/store/store.jsx b/assets/js/src/form_editor/store/store.jsx index 531e974e68..308fc2ef9b 100644 --- a/assets/js/src/form_editor/store/store.jsx +++ b/assets/js/src/form_editor/store/store.jsx @@ -60,7 +60,6 @@ export default () => { formErrors: validateForm(formData, formBlocks), segments: window.mailpoet_form_segments, customFields, - mailpoetPages: window.mailpoet_pages, isFormSaving: false, isCustomFieldSaving: false, isCustomFieldCreating: false, diff --git a/lib/AdminPages/Pages/FormEditor.php b/lib/AdminPages/Pages/FormEditor.php index 2e7063b554..0d8ac6a663 100644 --- a/lib/AdminPages/Pages/FormEditor.php +++ b/lib/AdminPages/Pages/FormEditor.php @@ -239,7 +239,6 @@ class FormEditor { 'iframe' => Export::get('iframe', $form), 'shortcode' => Export::get('shortcode', $form), ], - 'mailpoet_pages' => Pages::getMailPoetPages(), 'segments' => $this->segmentsListRepository->getListWithSubscribedSubscribersCounts([SegmentEntity::TYPE_DEFAULT]), 'styles' => $this->formRenderer->getCustomStyles($form), 'date_types' => array_map(function ($label, $value) { diff --git a/views/form/editor.html b/views/form/editor.html index 60e0f1192e..175066ac5b 100644 --- a/views/form/editor.html +++ b/views/form/editor.html @@ -19,7 +19,6 @@ var mailpoet_form_data = <%= json_encode(form) %>; var mailpoet_form_exports = <%= json_encode(form_exports) %>; var mailpoet_form_segments = <%= json_encode(segments) %>; - var mailpoet_pages = <%= json_encode(mailpoet_pages) %>; var mailpoet_custom_fields = <%= json_encode(custom_fields) %>; var mailpoet_date_types = <%= json_encode(date_types) %>; var mailpoet_date_formats = <%= json_encode(date_formats) %>;