MC-16111: Fixing column name for store

Author: Mark Berube

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

@@ -68,6 +68,24 @@ public function toOptionArray()
         return $this->options;
     }
 
+    /**
+     * Sanitize website/store option 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
      *
@@ -88,20 +106,20 @@ protected function generateCurrentOptions()
                     /** @var  \Magento\Store\Model\Store $store */
                     foreach ($storeCollection as $store) {
                         if ($store->getGroupId() == $group->getId()) {
-                            $name = $this->escaper->escapeHtml($store->getName());
+                            $name = $this->sanitizeName($store->getName());
                             $stores[$name]['label'] = str_repeat(' ', 8) . $name;
                             $stores[$name]['value'] = $store->getId();
                         }
                     }
                     if (!empty($stores)) {
-                        $name = $this->escaper->escapeHtml($group->getName());
+                        $name = $this->sanitizeName($group->getName());
                         $groups[$name]['label'] = str_repeat(' ', 4) . $name;
                         $groups[$name]['value'] = array_values($stores);
                     }
                 }
             }
             if (!empty($groups)) {
-                $name = $this->escaper->escapeHtml($website->getName());
+                $name = $this->sanitizeName($website->getName());
                 $this->currentOptions[$name]['label'] = $name;
                 $this->currentOptions[$name]['value'] = array_values($groups);
             }