MC-17807: Store name rendering in customer section

Hwashiang Yu · Hwashiang Yu · commit 715305608968 · 2019-06-26T16:28:25.000-05:00
- Resolved static and integration test failures
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/optgroup.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/optgroup.js
@@ -222,7 +222,7 @@ define([
                     ko.utils.setTextContent(option, allBindings.get('optionsCaption'));
                     ko.selectExtensions.writeValue(option, undefined);
                 } else if (typeof arrayEntry[optionsValue] === 'undefined') { // empty value === optgroup
-                    if (arrayEntry['__disableTmpl']) {
+                    if (arrayEntry.__disableTmpl) {
                         option = '<optgroup label="' + arrayEntry[optionsText] + '"></optgroup>';
                     } else {
                         option = utils.template(optgroupTmpl, {
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php
@@ -234,32 +234,35 @@ public static function getEntityStoresDataProvider()
                 null,
                 ['entity_id' => 3, 'store_ids' => [1]],
                 [
-                    ['label' => 'Main Website', 'value' => []],
+                    ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],
                     [
                         'label' => '    Main Website Store',
-                        'value' => [['label' => '    Default Store View', 'value' => 1]]
+                        'value' => [['label' => '    Default Store View', 'value' => 1]],
+                        '__disableTmpl' => true
                     ]
                 ],
             ],
             [
                 ['entity_id' => 2, 'name' => 'product2', 'url_key' => 'product2', 'store_ids' => [1]],
                 null,
                 [
-                    ['label' => 'Main Website', 'value' => []],
+                    ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],
                     [
                         'label' => '    Main Website Store',
-                        'value' => [['label' => '    Default Store View', 'value' => 1]]
+                        'value' => [['label' => '    Default Store View', 'value' => 1]],
+                        '__disableTmpl' => true
                     ]
                 ]
             ],
             [
                 ['entity_id' => 2, 'name' => 'product2', 'url_key' => 'product2', 'store_ids' => [1]],
                 ['entity_id' => 3, 'name' => 'product3', 'url_key' => 'product3', 'store_ids' => [1]],
                 [
-                    ['label' => 'Main Website', 'value' => []],
+                    ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],
                     [
                         'label' => '    Main Website Store',
-                        'value' => [['label' => '    Default Store View', 'value' => 1]]
+                        'value' => [['label' => '    Default Store View', 'value' => 1]],
+                        '__disableTmpl' => true
                     ]
                 ]
             ]
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php
@@ -78,10 +78,11 @@ public function testGetEntityStores()
         $form = $this->_getFormInstance($args);
 
         $expectedStores = [
-            ['label' => 'Main Website', 'value' => []],
+            ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],
             [
                 'label' => '    Main Website Store',
-                'value' => [['label' => '    Default Store View', 'value' => 1]]
+                'value' => [['label' => '    Default Store View', 'value' => 1]],
+                '__disableTmpl' => true
             ],
         ];
         $this->assertEquals($expectedStores, $form->getElement('store_id')->getValues());

Original file line number	Diff line number	Diff line change
`@@ -234,32 +234,35 @@ public static function getEntityStoresDataProvider()`
`234`	`234`	`null,`
`235`	`235`	`['entity_id' => 3, 'store_ids' => [1]],`
`236`	`236`	`[`
`237`		`- ['label' => 'Main Website', 'value' => []],`
	`237`	`+ ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],`
`238`	`238`	`[`
`239`	`239`	`'label' => ' Main Website Store',`
`240`		`- 'value' => [['label' => ' Default Store View', 'value' => 1]]`
	`240`	`+ 'value' => [['label' => ' Default Store View', 'value' => 1]],`
	`241`	`+ '__disableTmpl' => true`
`241`	`242`	`]`
`242`	`243`	`],`
`243`	`244`	`],`
`244`	`245`	`[`
`245`	`246`	`['entity_id' => 2, 'name' => 'product2', 'url_key' => 'product2', 'store_ids' => [1]],`
`246`	`247`	`null,`
`247`	`248`	`[`
`248`		`- ['label' => 'Main Website', 'value' => []],`
	`249`	`+ ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],`
`249`	`250`	`[`
`250`	`251`	`'label' => ' Main Website Store',`
`251`		`- 'value' => [['label' => ' Default Store View', 'value' => 1]]`
	`252`	`+ 'value' => [['label' => ' Default Store View', 'value' => 1]],`
	`253`	`+ '__disableTmpl' => true`
`252`	`254`	`]`
`253`	`255`	`]`
`254`	`256`	`],`
`255`	`257`	`[`
`256`	`258`	`['entity_id' => 2, 'name' => 'product2', 'url_key' => 'product2', 'store_ids' => [1]],`
`257`	`259`	`['entity_id' => 3, 'name' => 'product3', 'url_key' => 'product3', 'store_ids' => [1]],`
`258`	`260`	`[`
`259`		`- ['label' => 'Main Website', 'value' => []],`
	`261`	`+ ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],`
`260`	`262`	`[`
`261`	`263`	`'label' => ' Main Website Store',`
`262`		`- 'value' => [['label' => ' Default Store View', 'value' => 1]]`
	`264`	`+ 'value' => [['label' => ' Default Store View', 'value' => 1]],`
	`265`	`+ '__disableTmpl' => true`
`263`	`266`	`]`
`264`	`267`	`]`
`265`	`268`	`]`