Merge branch 'PB-61' of github.com:magento-obsessive-owls/magento2-page-builder into PR

Author: omiroshnichenko

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTests.xml

@@ -12,7 +12,7 @@
             <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="loginGetFromGeneralFile"/>
         </before>
         <after>
-            <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="amOnLogoutPage"/>
+            <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="adminLogout"/>
         </after>
     </test>
      <test name="AdminAddImageToCMSPageTinyMCE3Test">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest.xml

@@ -158,6 +158,32 @@
         <fillField selector="{{PageBuilderPanel.searchPanel}}" userInput="abcdef" stepKey="fillSearch"/>
         <see userInput="Nothing found" selector="{{PageBuilderPanel.nothingFound}}" stepKey="validateNothingFound"/>
     </test>
+    <test name="SearchSpecialCharactersInPanel">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Panel"/>
+            <title value="Search using special characters in PageBuilder Panel"/>
+            <description value="When searching using regular expression special characters, assert no JS errors are produced."/>
+            <severity value="AVERAGE"/>
+            <useCaseId value="PB-61"/>
+            <testCaseId value="MC-21478"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-panel"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
+            <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <fillField selector="{{PageBuilderPanel.searchPanel}}" userInput="$" stepKey="fillSearchWithInvalidInput"/>
+        <see userInput="Nothing found" selector="{{PageBuilderPanel.nothingFound}}" stepKey="validateNothingFound"/>
+        <dontSeeJsError stepKey="dontSeeJsError"/>
+        <fillField selector="{{PageBuilderPanel.searchPanel}}" userInput="Code" stepKey="fillCode"/>
+        <see userInput="HTML Code" selector="{{PageBuilderPanel.searchResults}}" stepKey="validateCodeButtonShowsUp"/>
+    </test>
     <test name="ClearSearchInPanel">
         <annotations>
             <features value="PageBuilder"/>

app/code/Magento/PageBuilder/view/adminhtml/web/js/panel.js

@@ -92,10 +92,14 @@ export default class Panel {
                 _.filter(
                     Config.getConfig("content_types"),
                     (contentType: ContentTypeConfigInterface) => {
-                        const regEx = new RegExp("\\b" + self.searchValue(), "gi");
-                        const matches = !!contentType.label.toLowerCase().match(regEx);
-                        return matches &&
-                            contentType.is_system === true;
+                        if (contentType.is_system !== true) {
+                            return false;
+                        }
+
+                        const escapedSearchValue = self.searchValue().replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&");
+                        const regEx = new RegExp("\\b" + escapedSearchValue, "gi");
+
+                        return regEx.test(contentType.label.toLowerCase());
                     },
                 ),
                 (contentType, identifier: string) => {