magento/magento2#12695: Unable to change attribute type from swatch by eugene-shab · Pull Request #12771 · magento/magento2

eugene-shab · 2017-12-15T16:34:18Z

Unable to change attribute type from swatch to dropdown

fixed the process of switching attribute input type

Description

Fixed Magento _Swatches module.

Fixed Issues (if relevant)

Unable to change attribute type from swatch to dropdown #12695: Unable to change attribute type from swatch to dropdown
Changing Swatches to Drop-down does not remove swatches from existing products #11703: Changing Swatches to Drop-down does not remove swatches from existing products
Color attribute taking swatch instead of Drop down option for configurable options, #9307: Color attribute taking swatch instead of Drop down option for configurable options
Product Attributes Not Updating on Frontend #11403: Product Attributes Not Updating on Frontend
Upgrading to 2.1.7 changed dropdown attributes to swatches #9923: Upgrading to 2.1.7 changed dropdown attributes to swatches

- fixed the process of switching attribute input type

magento-cicd2 · 2017-12-15T16:34:20Z

All committers have signed the CLA.

mslabko

@eugene-shab , Thank you for the contribution!

Please, check review comments

mslabko · 2017-12-18T08:42:34Z

+    /**
+     * @var SwatchResource
+     */
+    protected $swatchResource;


Use private

mslabko · 2017-12-18T08:44:10Z

    public function __construct(
        \Magento\Swatches\Model\ResourceModel\Swatch\CollectionFactory $collectionFactory,
        \Magento\Swatches\Model\SwatchFactory $swatchFactory,
+        SwatchResource $swatchResource,


For make it backward compatible, set new dependency as optional and use ObjectManager to instantiating it

mslabko · 2017-12-18T08:45:18Z

            if (!empty($additionalData)) {
                $additionalData = $this->serializer->unserialize($additionalData);
                if (is_array($additionalData) && isset($additionalData[Swatch::SWATCH_INPUT_TYPE_KEY])) {
+                    if ($additionalData[Swatch::SWATCH_INPUT_TYPE_KEY] == Swatch::SWATCH_INPUT_TYPE_VISUAL) {


This issue relevant only for visusal swatches?

Yes. Only when switching from visual to dropdown input type.

mslabko · 2017-12-18T08:46:23Z

+        $optionsIDs = [];
+        if (count($attribute->getOption())) {
+            $options = $attribute->getOption();
+            foreach ($options['value'] as $id => $item) {


array_column can be used for simplify code

mslabko · 2017-12-18T08:51:05Z

+        if (count($attribute->getOptiontext())) {
+            $options = $attribute->getOptiontext();
+            if (count($options)) {
+                foreach ($options['value'] as $id => $item) {


array_column can be used for simplify code

mslabko · 2017-12-18T08:54:43Z

+        }
+    }
+
+    public function clearSwatchOptionTextByOptionId($optionIDs, $type)


Doc missed.

Can we merge both methods? It looks like "type" is redundant if we already have option id for delete

mslabko · 2017-12-18T08:55:16Z

     * @return array
     */
-    public function getCodes()
+        public function getCodes()


please, remove extra spaces

mslabko · 2017-12-18T08:59:17Z

    ) {
        $this->typeConfigurable = $typeConfigurable;
        $this->swatchAttributeCodes = $swatchAttributeCodes;
+        $this->swatchHelper = $swatchHelper;


For make it backward compatible, set new dependency as optional and use ObjectManager to instantiating it

mslabko · 2017-12-18T09:06:22Z

-                    $swatchAttributes[$configurableAttribute->getAttributeId()]
-                        = $configurableAttribute->getProductAttribute();
+                // Due to $this->swatchAttributeCodes->getCodes() - return swatch data for every attribute.
+                if ($this->swatchHelper->isSwatchAttribute($configurableAttribute->getProductAttribute())) {


For more readability, these conditions can be moved to private method with description of intention of extra condition

Also, mark this method as deprecated and add comment that this method introduced only for case when customer already has converted attribute.

mslabko · 2017-12-18T09:09:36Z

        Configurable $typeConfigurable,
-        SwatchAttributeCodes $swatchAttributeCodes
+        SwatchAttributeCodes $swatchAttributeCodes,
+        \Magento\Swatches\Helper\Data\Proxy $swatchHelper


Please, set proxy $swatchHelper in di.xml (remove \Proxy from construct and move it to di.xml)

Proxies and interceptors MUST NEVER be explicitly requested in constructors. See:
http://devdocs.magento.com/guides/v2.2/coding-standards/technical-guidelines.html

ishakhsuvarov

Please see review by @mslabko

- fixes after code review.

- fixes after code review

- fixes after code review.

sidolov · 2018-03-11T13:32:33Z

Hi @eugene-shab , please, merge latest mainline to your branch, resolve conflicts and we continue work with PR. Thanks!

eugene-shab · 2018-03-19T09:50:36Z

After last changes in 2.2-develop: it seems that method hasSwatchAttribute can be removed.

Please continue.

Merged with last commits

sidolov · 2018-04-12T13:22:52Z

+     * @return bool
+     * @deprecated
+     */
+    private function hasSwatchAttribute($productAttribute)


I think this method left from the previous implementation and useless for now, please, revert

sidolov · 2018-04-12T13:23:40Z

        $this->productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getId', 'getTypeId']);
        $this->swatchTypeChecker = $this->createMock(SwatchAttributeType::class);

+//        $this->swatchHelper = (new ObjectManager($this))


Please, remove commented code

sidolov · 2018-04-12T13:25:37Z

Hi @eugene-shab , just a few fixes needed and please, take a look on failed tests

@sidolov

- fixes regarding comments @sidolov

- fixed the unit test: testProvide().

- remove empty line.

magento-engcom-team · 2018-05-04T12:46:06Z

Hi @sidolov, thank you for the review.
ENGCOM-1443 has been created to process this Pull Request

ishakhsuvarov · 2018-06-22T14:33:36Z

@magento-engcom-team give me 2.2-develop instance

magento-engcom-team · 2018-06-22T14:33:38Z

Hi @ishakhsuvarov. Thank you for your request. I'm working on Magento 2.2-develop instance for you

magento-engcom-team · 2018-06-22T14:34:16Z

Hi @ishakhsuvarov, here is your Magento instance.
Admin access: https://i-12771-2-2-develop.engcom.dev.magento.com/admin
Login: admin Password: 123123q
Instance will be terminated in up to 3 hours.

ishakhsuvarov · 2018-06-22T14:42:56Z

@magento-engcom-team give me new test instance

magento-engcom-team · 2018-06-22T14:42:56Z

Hi @ishakhsuvarov. Thank you for your request. I'm working on Magento instance for you

magento-engcom-team · 2018-06-22T14:43:39Z

Hi @ishakhsuvarov, here is your new Magento instance.
Admin access: https://pr-12771.engcom.dev.magento.com/admin
Login: admin Password: 123123q
Please make sure you are PR author or assignee to access the instance.

magento-engcom-team · 2018-06-24T15:19:05Z

Hi @eugene-shab. Thank you for your contribution.
Changes from your Pull Request will be available with the upcoming 2.2.6 release.

Please, consider to port this solution to 2.3 release line.
You may use Porting tool to port commits automatically.

#12695: Unable to change attribute type from swatch to dropdown

39b1ef3

- fixed the process of switching attribute input type

magento-engcom-team added bugfix Component: Catalog mageconf Reproduced on 2.1.x The issue has been reproduced on latest 2.1 release Reproduced on 2.2.x The issue has been reproduced on latest 2.2 release Reproduced on 2.3.x The issue has been reproduced on latest 2.3 release labels Dec 15, 2017

mslabko suggested changes Dec 18, 2017

View reviewed changes

ishakhsuvarov requested changes Dec 18, 2017

View reviewed changes

ishakhsuvarov added the Progress: needs update label Dec 18, 2017

omiroshnichenko mentioned this pull request Dec 18, 2017

Correctly provide list of swatch attributes for product #11703 #12237

Closed

4 tasks

eugene-shab added 6 commits December 21, 2017 13:01

#12695: Unable to change attribute type from swatch to dropdown

94539b7

- fixes after code review.

#12695: Unable to change attribute type from swatch to dropdown

3d76096

- fixes after code review

#12695: Unable to change attribute type from swatch to dropdown

0b079e0

- fixes after code review.

#12695: Unable to change attribute type from swatch to dropdown

71d30b7

- fixes after code review.

#12695: Unable to change attribute type from swatch to dropdown

47b2f48

- fixes after code review.

#12695: Unable to change attribute type from swatch to dropdown

707f1cd

- fixes after code review.

sidolov self-assigned this Mar 11, 2018

eugene-shab and others added 2 commits March 19, 2018 11:36

Added after merge.

9153fe2

Merge branch '2.2-develop' into 12695

1bd4acf

Merge pull request #1 from magento/2.2-develop

f499027

Merged with last commits

sidolov requested changes Apr 12, 2018

View reviewed changes

eugene-shab added 4 commits May 3, 2018 12:03

Merge branch '2.2-develop' of github.com:eugene-shab/magento2 into 12695

3fa9ed2

#12695: Unable to change attribute type from swatch to dropdown

8fa792a

- fixes regarding comments @sidolov

#12695: Unable to change attribute type from swatch to dropdown

7cd7ade

- fixed the unit test: testProvide().

#12695: Unable to change attribute type from swatch to dropdown

54ad76c

- remove empty line.

Removed unused dependency

cb6975c

sidolov approved these changes May 4, 2018

View reviewed changes

magento-engcom-team added this to the May 2018 milestone May 4, 2018

magento-engcom-team added the Release Line: 2.2 label May 4, 2018

magento-engcom-team removed the Progress: needs update label May 4, 2018

okorshenko removed this from the May 2018 milestone May 31, 2018

okorshenko removed the mageconf label Jun 5, 2018

eugene-shab mentioned this pull request Jun 22, 2018

Unable to change attribute type from swatch to dropdown #12695

Closed

magento-engcom-team added the Progress: accept label Jun 22, 2018

magento-engcom-team merged commit cb6975c into magento:2.2-develop Jun 24, 2018

magento-engcom-team pushed a commit that referenced this pull request Jun 24, 2018

ENGCOM-1443: #12695: Unable to change attribute type from swatch #12771

d44ec51

magento-engcom-team added Award: bug fix Award: test coverage labels Jun 24, 2018

eugene-shab self-assigned this Jun 27, 2018

eugene-shab deleted the 12695 branch July 5, 2018 19:40

eugene-shab restored the 12695 branch July 6, 2018 12:50

eugene-shab deleted the 12695 branch July 6, 2018 12:55

nmalevanec mentioned this pull request Aug 22, 2018

[Forwardport] Unable to change attribute type from swatch #17750

Merged

Conversation

eugene-shab commented Dec 15, 2017

Description

Fixed Issues (if relevant)

Uh oh!

magento-cicd2 commented Dec 15, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mslabko left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ishakhsuvarov left a comment

Choose a reason for hiding this comment

Uh oh!

sidolov commented Mar 11, 2018

Uh oh!

eugene-shab commented Mar 19, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sidolov commented Apr 12, 2018

Uh oh!

magento-engcom-team commented May 4, 2018

Uh oh!

ishakhsuvarov commented Jun 22, 2018

Uh oh!

magento-engcom-team commented Jun 22, 2018

Uh oh!

magento-engcom-team commented Jun 22, 2018

Uh oh!

ishakhsuvarov commented Jun 22, 2018

Uh oh!

magento-engcom-team commented Jun 22, 2018

Uh oh!

magento-engcom-team commented Jun 22, 2018

Uh oh!

magento-engcom-team commented Jun 24, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

magento-cicd2 commented Dec 15, 2017 •

edited

Loading

mslabko left a comment •

edited

Loading