Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve wording, add hints, fix javascript form validation #891

Merged
merged 1 commit into from
Aug 3, 2023

Conversation

Hlavtox
Copy link
Contributor

@Hlavtox Hlavtox commented Aug 2, 2023

Questions Answers
Description? See below
Type? improvement
BC breaks? no
Deprecations? no
Fixed ticket?
How to test? Test the backoffice section of the module. Do not waste time testing the front office - there is no change.

Improved checks on edit filter page

  • Validates if at least one page was submitted on JS side. It failed on PHP side before.
  • Before, it checked if ANY category was checked all the time and refused to submit the filter, even though the category controller wasn't checked in the list above - fixed. Now it complains for categories ONLY if you check Category above.

Extended cron tasks section

Snímek obrazovky 2023-08-02 144405

Added explanations to filter options

Snímek obrazovky 2023-08-02 144449

Added helper to edit filter page

Snímek obrazovky 2023-08-02 144518


This change is Reviewable

@Hlavtox
Copy link
Contributor Author

Hlavtox commented Aug 2, 2023

Ping @kpodemski

@Hlavtox Hlavtox added this to the 3.13.1 milestone Aug 2, 2023
Copy link
Contributor

@matthieu-rolland matthieu-rolland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, I just have one question about a generated css file that is modified

@@ -1 +1 @@
{"version":3,"file":"front.css","mappings":"AAkBA,iBACE,MAAO,CACP,KAAM,CACN,UAAW,CACX,WAAY,CACZ,cAAe,CACf,mCAAuC,CACvC,WAAY,CAPd,iCAUI,MAAO,CACP,KAAM,CACN,UAAW,CACX,WAAY,CACZ,iBAAkB,CAdtB,mCAkBI,QAAS,CACT,iBAAkB,CAClB,OAAQ,CACR,+BAAgC,CArBpC,0BAyBI,UAAW,CACX,WAAY,CACZ,oBAAqB,CACrB,gBAAiB,CACjB,mCAAuC,CACvC,qBAAsB,CACtB,iCAAkC,CAClC,kBAAmB,CACnB,kBAAmB,CACpB,gBAID,KACE,wBAAyB;;ACvC7B,wDAGM,gBAAiB,CACjB,cAAe,CAJrB,kCAQI,eAAgB,CARpB,6CAYM,UAAW,CACX,WAAY,CACZ,eAAgB,CAChB,qBAAsB,CAf5B,sCAmBI,WAAY;;ACZhB,8BAGM,YAAa,CAHnB,8CAKQ,gBAAiB,CALzB,oCANE,uBAAwB,CACxB,eAAgB,CAChB,sBAAuB,CACvB,kBAAmB,CAGrB,oCAcM,UAAW,CACX,eAAgB,CAftB,uGAkBQ,QAAS,CACT,cAAe,CAnBvB,2CAsBQ,aAAc,CAtBtB,sCANE,uBAAwB,CACxB,eAAgB,CAChB,sBAAuB,CACvB,kBAAmB","sources":["webpack://ps_facetedsearch/./_dev/front/overlay.scss","webpack://ps_facetedsearch/./_dev/front/slider.scss","webpack://ps_facetedsearch/./_dev/front/facet.scss"],"sourcesContent":["/**\n * Copyright since 2007 PrestaShop SA and Contributors\n * PrestaShop is an International Registered Trademark & Property of PrestaShop SA\n *\n * NOTICE OF LICENSE\n *\n * This source file is subject to the Academic Free License 3.0 (AFL-3.0)\n * that is bundled with this package in the file LICENSE.md.\n * It is also available through the world-wide-web at this URL:\n * https://opensource.org/licenses/AFL-3.0\n * If you did not receive a copy of the license and are unable to\n * obtain it through the world-wide-web, please send an email\n * to license@prestashop.com so we can send you a copy immediately.\n *\n * @author PrestaShop SA <contact@prestashop.com>\n * @copyright Since 2007 PrestaShop SA and Contributors\n * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)\n */\n.faceted-overlay {\n left: 0;\n top: 0;\n width: 100%;\n height: 100%;\n position: fixed;\n background-color: rgba(25, 25, 25, 0.5);\n z-index: 100;\n\n .overlay__inner {\n left: 0;\n top: 0;\n width: 100%;\n height: 100%;\n position: absolute;\n }\n\n .overlay__content {\n left: 50%;\n position: absolute;\n top: 50%;\n transform: translate(-50%, -50%);\n }\n\n .spinner {\n width: 75px;\n height: 75px;\n display: inline-block;\n border-width: 2px;\n border-color: rgba(255, 255, 255, 0.05);\n border-top-color: #fff;\n animation: spin 1s infinite linear;\n border-radius: 100%;\n border-style: solid;\n }\n}\n\n@keyframes spin {\n 100% {\n transform: rotate(360deg);\n }\n}\n","/**\n * Copyright since 2007 PrestaShop SA and Contributors\n * PrestaShop is an International Registered Trademark & Property of PrestaShop SA\n *\n * NOTICE OF LICENSE\n *\n * This source file is subject to the Academic Free License 3.0 (AFL-3.0)\n * that is bundled with this package in the file LICENSE.md.\n * It is also available through the world-wide-web at this URL:\n * https://opensource.org/licenses/AFL-3.0\n * If you did not receive a copy of the license and are unable to\n * obtain it through the world-wide-web, please send an email\n * to license@prestashop.com so we can send you a copy immediately.\n *\n * @author PrestaShop SA <contact@prestashop.com>\n * @copyright Since 2007 PrestaShop SA and Contributors\n * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)\n */\n#search_filters {\n .ui-slider-horizontal {\n .ui-slider-handle {\n margin-left: -1px;\n cursor: pointer;\n }\n }\n .ui-widget-header {\n background: #555;\n }\n .ui-slider {\n .ui-slider-handle {\n top: -.45em;\n width: 0.4em;\n background: #fff;\n border: 1px solid #555;\n }\n }\n .ui-slider-horizontal {\n height: .4em;\n }\n}\n","/**\n * Copyright since 2007 PrestaShop SA and Contributors\n * PrestaShop is an International Registered Trademark & Property of PrestaShop SA\n *\n * NOTICE OF LICENSE\n *\n * This source file is subject to the Academic Free License 3.0 (AFL-3.0)\n * that is bundled with this package in the file LICENSE.md.\n * It is also available through the world-wide-web at this URL:\n * https://opensource.org/licenses/AFL-3.0\n * If you did not receive a copy of the license and are unable to\n * obtain it through the world-wide-web, please send an email\n * to license@prestashop.com so we can send you a copy immediately.\n *\n * @author PrestaShop SA <contact@prestashop.com>\n * @copyright Since 2007 PrestaShop SA and Contributors\n * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)\n */\n@mixin text-ellipsis() {\n width: calc(100% - 30px);\n overflow: hidden;\n text-overflow: ellipsis;\n white-space: nowrap;\n}\n\n#search_filters {\n .facet {\n .title {\n display: flex;\n .collapse-icons {\n margin-left: auto;\n }\n }\n\n .facet-title {\n @include text-ellipsis();\n }\n\n .facet-label {\n width: 100%;\n text-align: left;\n .custom-checkbox,\n .custom-radio {\n top: -7px;\n margin-right: 0;\n }\n .color {\n margin-left: 0;\n }\n\n a {\n @include text-ellipsis();\n }\n }\n }\n}\n"],"names":[],"sourceRoot":""}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what file modification did trigger this? 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@matthieu-rolland Just running npm install and npm run build

@aniszr aniszr self-assigned this Aug 3, 2023
Copy link

@aniszr aniszr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @Hlavtox

Thanks for your PR, all improvements for the wording are well displayed ✔️
LGTM ✔️ QA ✔️

See attached screen record :

Module.Manager.prestashop811.mp4

Thanks!

@Hlavtox Hlavtox merged commit 9df5f04 into PrestaShop:dev Aug 3, 2023
12 checks passed
@Hlavtox
Copy link
Contributor Author

Hlavtox commented Aug 3, 2023

Thanks @aniszr! :-)

@Hlavtox Hlavtox deleted the non-category-filter branch August 3, 2023 10:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants