MC-18761: Fix incorrect website name rendering

Author: SeruyV

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php

@@ -186,6 +186,7 @@ protected function getFieldsForFieldset()
                             'componentType' => Form\Field::NAME,
                             'formElement' => Form\Element\Checkbox::NAME,
                             'description' => __($website['name']),
+                            '__disableTmpl' => true,
                             'tooltip' => $tooltip,
                             'sortOrder' => $sortOrder,
                             'dataScope' => 'website_ids.' . $website['id'],
@@ -353,18 +354,21 @@ protected function getWebsitesOptionsList()
             $websiteOption = [
                 'value' => '0.' . $website['id'],
                 'label' => __($website['name']),
+                '__disableTmpl' => true,
             ];
             $groupOptions = [];
             foreach ($website['groups'] as $group) {
                 $groupOption = [
                     'value' => '0.' . $website['id'] . '.' . $group['id'],
                     'label' => __($group['name']),
+                    '__disableTmpl' => true,
                 ];
                 $storeViewOptions = [];
                 foreach ($group['stores'] as $storeView) {
                     $storeViewOptions[] = [
                         'value' => $storeView['id'],
                         'label' => __($storeView['name']),
+                        '__disableTmpl' => true,
                     ];
                 }
                 if (!empty($storeViewOptions)) {

app/code/Magento/Store/Model/System/Store.php

@@ -142,6 +142,7 @@ public function getStoreValuesForForm($empty = false, $all = false)
                     $values[] = [
                         'label' => str_repeat($nonEscapableNbspChar, 4) . $store->getName(),
                         'value' => $store->getId(),
+                        '__disableTmpl' => true,
                     ];
                 }
                 if (!empty($values)) {

app/code/Magento/Store/Test/Unit/Model/System/StoreTest.php

@@ -271,11 +271,15 @@ public function getStoreValuesForFormDataProvider()
                     [
                         'label' => str_repeat($nonEscapableNbspChar, 4) . $groupName,
                         'value' => [
-                            ['label' => str_repeat($nonEscapableNbspChar, 4) . $storeName, 'value' => $storeId]
+                            [
+                                'label' => str_repeat($nonEscapableNbspChar, 4) . $storeName,
+                                'value' => $storeId,
+                                '__disableTmpl' => true,
+                            ],
                         ],
                         '__disableTmpl' => true
                     ],
-                ]
+                ],
             ],
         ];
     }

app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php

@@ -68,26 +68,6 @@ public function toOptionArray()
         return $this->options;
     }
 
-    /**
-     * Sanitize website/store option name
-     *
-     * @param string $name
-     *
-     * @return string
-     */
-    protected function sanitizeName($name)
-    {
-        $matches = [];
-        preg_match('/\$[:]*{(.)*}/', $name, $matches);
-        if (count($matches) > 0) {
-            $name = $this->escaper->escapeHtml($this->escaper->escapeJs($name));
-        } else {
-            $name = $this->escaper->escapeHtml($name);
-        }
-
-        return $name;
-    }
-
     /**
      * Generate current options
      *
@@ -108,22 +88,26 @@ protected function generateCurrentOptions()
                     /** @var  \Magento\Store\Model\Store $store */
                     foreach ($storeCollection as $store) {
                         if ($store->getGroupId() == $group->getId()) {
-                            $name = $this->sanitizeName($store->getName());
+                            $name = $store->getName();
                             $stores[$name]['label'] = str_repeat(' ', 8) . $name;
                             $stores[$name]['value'] = $store->getId();
+                            $stores[$name]['__disableTmpl'] = true;
                         }
                     }
                     if (!empty($stores)) {
-                        $name = $this->sanitizeName($group->getName());
+                        $name = $group->getName();
                         $groups[$name]['label'] = str_repeat(' ', 4) . $name;
                         $groups[$name]['value'] = array_values($stores);
+                        $groups[$name]['__disableTmpl'] = true;
+
                     }
                 }
             }
             if (!empty($groups)) {
-                $name = $this->sanitizeName($website->getName());
+                $name = $website->getName();
                 $this->currentOptions[$name]['label'] = $name;
                 $this->currentOptions[$name]['value'] = array_values($groups);
+                $this->currentOptions[$name]['__disableTmpl'] = true;
             }
         }
     }