Cms page fixes #13144

zuk3975 · 2019-04-02T12:39:29Z

Questions	Answers
Branch?	1.7.6.x
Description?	Adds `save and preview` button in create/edit cms page form and `missing constraints` in cmsPageCategoryType (Added TypedRegexConstraints and missing Length constraints) . `Refactors CmsPageController` to handle exceptions properly. (Avoid code replication from FrameworkBundleAdminController->getErrorMessageForException which wasn't implemented before).
cms page.
Type?	refacto
Category?	BO
BC breaks?	no
Deprecations?	no
Fixed ticket?
How to test?	Go to `Improve > design > pages`, use interface buttons to create or edit cms page. Once form is ready to submit, press `Save and preview` button. You should be redirected to edit page (same cms page that you previously edited or created) `new window should popup` with front office of that edited/created cms page. Make sure that browser doesn't block popup, else you will see native browser warning of blocked popup window, but new window won't open. In cmsCategory forms added `field length constraints` as in legacy code (for example name field max 64 chars). Everything else should work as before. ⚠️ Assets may need to be rebuilt.

This change is

zuk3975 · 2019-04-03T08:52:17Z

@matks ready for review

admin-dev/themes/new-theme/js/components/form/preview-opener.js

src/Adapter/CMS/Page/QueryHandler/GetCmsPageForEditingHandler.php

src/Core/Domain/CmsPage/QueryResult/EditableCmsPage.php

zuk3975 · 2019-04-03T14:13:00Z

@matks addressed your comments

matks · 2019-04-04T14:30:13Z

@zuk3975 Travis is not happy. I think with a rebase you should be fine as I see code on develoop is fine: https://github.com/PrestaShop/PrestaShop/blob/develop/src/PrestaShopBundle/Form/Admin/Improve/Design/Pages/CmsPageCategoryType.php#L82

sarjon · 2019-04-08T09:43:16Z

admin-dev/themes/new-theme/js/components/form/preview-opener.js

+  open() {
+    const urlParams = new URLSearchParams(location.search);
+
+    if (this.previewUrl && urlParams.has('open_preview') && this.disablePreview !== 1) {


could you rename this.disablePreview !== 1 so we can avoid !== check?

sarjon · 2019-04-08T09:43:52Z

admin-dev/themes/new-theme/js/pages/cms-page/form/index.js

@@ -1,3 +1,5 @@
+import PreviewOpener from '../../../components/form/preview-opener';


I think this file needs license.

sarjon · 2019-04-08T09:44:13Z

admin-dev/themes/new-theme/js/components/form/preview-opener.js

+  /**
+   * Opens new page of provided url if query contains specific parameters
+   */
+  open() {


Shouldn't it be private?

sarjon · 2019-04-08T09:44:52Z

admin-dev/themes/new-theme/js/components/form/preview-opener.js

+ * Responsible for opening another page with specified url.
+ * For example used in 'Save and preview' cms page create/edit actions
+ */
+export default class PreviewOpener {


Please document usage of this component.

sarjon · 2019-04-08T09:46:05Z

src/Core/Domain/CmsPage/QueryResult/EditableCmsPage.php

+    /**
+     * @var string
+     */
+    private $previewUrl;


Can you document this attribute?

sarjon · 2019-04-08T09:46:33Z

src/PrestaShopBundle/Controller/Admin/Sell/Catalog/ManufacturerController.php

@@ -158,6 +158,9 @@ public function createAction(Request $request)
        } catch (CoreException $e) {
            $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
        }
+        if ($request->isXmlHttpRequest()) {
+            return $this->json('test');


Hmmmm. 😄

sarjon · 2019-04-08T09:48:13Z

src/PrestaShopBundle/Controller/Admin/Improve/Design/CmsPageController.php

+            }
+
+            /* When form is submitted, but invalid, disable opening preview page */
+            if ($result->isSubmitted()) {


You don't check if form is invalid, but comment says you should.

sarjon · 2019-04-08T09:49:29Z

src/PrestaShopBundle/Controller/Admin/Improve/Design/CmsPageController.php

+                    [
+                        sprintf(
+                            '"%s"',
+                            $this->trans('Name', 'Admin.Global')),


Weird place for ) at the end. Same for other items in this array. I think you could inline it.

sarjon · 2019-04-08T09:51:26Z

src/Adapter/CMS/Page/QueryHandler/GetCmsPageForEditingHandler.php

-                $cms->getAssociatedShops()
-            );
+                $cms->getAssociatedShops(),
+                $this->context->link->getCMSLink($cms, null, null, $this->context->language->id)


You can inject Link and $langId instead of Context.

src/PrestaShopBundle/Resources/views/Admin/Improve/Design/Cms/Blocks/form.html.twig

zuk3975 · 2019-04-08T11:13:48Z

@matks ready

matks · 2019-04-09T08:59:26Z

@zuk3975 PR approved 😉 however I need you to make it target 1.7.6.x instead of develop

matks · 2019-04-10T08:11:30Z

@LouiseBonnard Your requested change has been handled so I add the "Wording ✔️" label 😉

prestonBot added develop Branch Refactoring Type: Refactoring Waiting for wording Status: action required, waiting for wording labels Apr 2, 2019

zuk3975 force-pushed the m/cms-page/save-n-preview branch from 83b7fd7 to bff7ef7 Compare April 2, 2019 13:20

zuk3975 changed the title ~~Cms page create/edit action "save and preview" button migration~~ [WIP] Cms page fixes Apr 2, 2019

zuk3975 changed the title ~~[WIP] Cms page fixes~~ Cms page fixes Apr 2, 2019

zuk3975 changed the title ~~Cms page fixes~~ [WIP]Cms page fixes Apr 3, 2019

zuk3975 changed the title ~~[WIP]Cms page fixes~~ Cms page fixes Apr 3, 2019

matks added the migration symfony migration project label Apr 3, 2019

matks reviewed Apr 3, 2019

View reviewed changes

admin-dev/themes/new-theme/js/components/form/preview-opener.js Outdated Show resolved Hide resolved

src/Adapter/CMS/Page/QueryHandler/GetCmsPageForEditingHandler.php Outdated Show resolved Hide resolved

src/Core/Domain/CmsPage/QueryResult/EditableCmsPage.php Outdated Show resolved Hide resolved

zuk3975 force-pushed the m/cms-page/save-n-preview branch from 17e7829 to 5e84e77 Compare April 3, 2019 14:20

matks mentioned this pull request Apr 3, 2019

Migrate "Design > Pages > Add new / edit page" page #10566

Closed

4 tasks

zuk3975 added 14 commits April 8, 2019 10:19

Implemented "save and preview" and enabled in cms page create/edit

2a0688b

Minor button styling

ce9f4db

Assets rebuilt

d67fda2

Removed missing class

9535d71

Optimized cms controller error handling

e47de0e

Added missing exception handling

87b9bff

Added missing parent category pre-select in create form

812f69c

Added missing constraints for CmsPageCategoryType

819c89f

Fixed javascript block in forms

1d1c45d

Modified some translation domains in twig

fe60181

Some code optimization

dfa1b10

Removed unecessary variable

422fb61

applied cs-fixer

7529953

Added ChoiceTree js in form

b41c728

zuk3975 force-pushed the m/cms-page/save-n-preview branch from ef54b12 to b41c728 Compare April 8, 2019 08:33

zuk3975 added 3 commits April 8, 2019 12:05

Fixed wrong class name in form

49b9f34

Modified preview opener to be disabled when form is invalid

1057c1c

rebuilt assets

d378428

sarjon reviewed Apr 8, 2019

View reviewed changes

LouiseBonnard reviewed Apr 8, 2019

View reviewed changes

src/PrestaShopBundle/Resources/views/Admin/Improve/Design/Cms/Blocks/form.html.twig Outdated Show resolved Hide resolved

zuk3975 added 2 commits April 8, 2019 14:05

Code optimization

a2f9822

rebuilt assets

f5b20d3

matks approved these changes Apr 9, 2019

View reviewed changes

prestonBot added the 1.7.6.x Branch label Apr 9, 2019

zuk3975 changed the base branch from develop to 1.7.6.x April 9, 2019 09:07

matks added Waiting for QA Status: action required, waiting for test feedback and removed develop Branch labels Apr 9, 2019

marionf self-assigned this Apr 9, 2019

marionf added QA ✔️ Status: check done, code approved and removed Waiting for QA Status: action required, waiting for test feedback labels Apr 9, 2019

marionf added this to the 1.7.6.0 milestone Apr 9, 2019

marionf removed their assignment Apr 9, 2019

matks added Wording ✔️ Status: check done, wording approved and removed Waiting for wording Status: action required, waiting for wording labels Apr 10, 2019

matks merged commit f170846 into PrestaShop:1.7.6.x Apr 10, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cms page fixes #13144

Cms page fixes #13144

zuk3975 commented Apr 2, 2019 •

edited

zuk3975 commented Apr 3, 2019

zuk3975 commented Apr 3, 2019

matks commented Apr 4, 2019

sarjon Apr 8, 2019

sarjon Apr 8, 2019

sarjon Apr 8, 2019

sarjon Apr 8, 2019

sarjon Apr 8, 2019

sarjon Apr 8, 2019

sarjon Apr 8, 2019

sarjon Apr 8, 2019

sarjon Apr 8, 2019

zuk3975 commented Apr 8, 2019

matks commented Apr 9, 2019

matks commented Apr 10, 2019

		@@ -1,3 +1,5 @@
		import PreviewOpener from '../../../components/form/preview-opener';

Cms page fixes #13144

Cms page fixes #13144

Conversation

zuk3975 commented Apr 2, 2019 • edited

zuk3975 commented Apr 3, 2019

zuk3975 commented Apr 3, 2019

matks commented Apr 4, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zuk3975 commented Apr 8, 2019

matks commented Apr 9, 2019

matks commented Apr 10, 2019

zuk3975 commented Apr 2, 2019 •

edited