removed full text search when creating new entity and GRID causing error

magento · Apr 23, 2024 · f22b233 · f22b233
1 parent 75ffe6e
commit f22b233
Show file tree

Hide file tree

Showing 14 changed files with 67 additions and 244 deletions.
diff --git a/resources/magento2/common.properties b/resources/magento2/common.properties
@@ -60,7 +60,6 @@ common.entityIdField=Entity ID Field
 common.addToolbar=Add Toolbar
 common.addToolbarListingPaging=Add Toolbar Listing Paging
 common.addToolbarListingFilters=Add Toolbar Listing Filters
-common.addToolbarFullTextSearch=Add Toolbar Full Text Search
 common.addToolbarColumnsControl=Add Toolbar Columns Control
 common.addToolbarBookmarks=Add Toolbar Bookmarks
 common.argument=Argument name

diff --git a/src/com/magento/idea/magento2plugin/actions/generation/data/UiComponentGridToolbarData.java b/src/com/magento/idea/magento2plugin/actions/generation/data/UiComponentGridToolbarData.java
@@ -10,7 +10,6 @@ public class UiComponentGridToolbarData {
     private final boolean addToolbar;
     private final boolean addBookmarks;
     private final boolean addColumnsControls;
-    private final boolean addFulltextSearch;
     private final boolean addListingFilters;
     private final boolean addListingPaging;
 
@@ -20,22 +19,19 @@ public class UiComponentGridToolbarData {
      * @param addToolbar Add toolbar
      * @param addBookmarks Add bookmarks
      * @param addColumnsControls Add columns controls
-     * @param addFulltextSearch Add fulltext search
      * @param addListingFilters Add listing filters
      * @param addListingPaging Add listing paging
      */
     public UiComponentGridToolbarData(
             final boolean addToolbar,
             final boolean addBookmarks,
             final boolean addColumnsControls,
-            final boolean addFulltextSearch,
             final boolean addListingFilters,
             final boolean addListingPaging
     ) {
         this.addToolbar = addToolbar;
         this.addBookmarks = addBookmarks;
         this.addColumnsControls = addColumnsControls;
-        this.addFulltextSearch = addFulltextSearch;
         this.addListingFilters = addListingFilters;
         this.addListingPaging = addListingPaging;
     }
@@ -76,15 +72,6 @@ public boolean isAddColumnsControls() {
         return addColumnsControls;
     }
 
-    /**
-     * Is add fulltext search.
-     *
-     * @return Boolean
-     */
-    public boolean isAddFulltextSearch() {
-        return addFulltextSearch;
-    }
-
     /**
      * Is add listing filters.
      *

diff --git a/...actions/generation/data/converter/newentitydialog/UiComponentGridToolbarDtoConverter.java b/...actions/generation/data/converter/newentitydialog/UiComponentGridToolbarDtoConverter.java
@@ -29,7 +29,6 @@ public UiComponentGridToolbarDtoConverter(
                 newEntityDialogData.hasToolbar(),
                 newEntityDialogData.hasToolbarBookmarks(),
                 newEntityDialogData.hasToolbarColumnsControl(),
-                newEntityDialogData.hasToolbarFullTextSearch(),
                 newEntityDialogData.hasToolbarListingFilters(),
                 newEntityDialogData.hasToolbarListingPaging()
 

diff --git a/src/com/magento/idea/magento2plugin/actions/generation/data/dialog/NewEntityDialogData.java b/src/com/magento/idea/magento2plugin/actions/generation/data/dialog/NewEntityDialogData.java
@@ -30,7 +30,6 @@ public class NewEntityDialogData implements DialogData {
     private final boolean toolbarColumnsControl;
     private final boolean toolbarListingFilters;
     private final boolean toolbarListingPaging;
-    private final boolean toolbarFullTextSearch;
 
     // Acl tab data.
     private final String parentAclId;
@@ -66,7 +65,6 @@ public class NewEntityDialogData implements DialogData {
      * @param hasToolbarColumnsControl boolean
      * @param hasToolbarListingFilters boolean
      * @param hasToolbarListingPaging boolean
-     * @param hasToolbarFullTextSearch boolean
      * @param parentAclId String
      * @param aclId String
      * @param aclTitle String
@@ -94,7 +92,6 @@ public NewEntityDialogData(
             final boolean hasToolbarColumnsControl,
             final boolean hasToolbarListingFilters,
             final boolean hasToolbarListingPaging,
-            final boolean hasToolbarFullTextSearch,
             final @NotNull String parentAclId,
             final @NotNull String aclId,
             final @NotNull String aclTitle,
@@ -121,7 +118,6 @@ public NewEntityDialogData(
         this.toolbarColumnsControl = hasToolbarColumnsControl;
         this.toolbarListingFilters = hasToolbarListingFilters;
         this.toolbarListingPaging = hasToolbarListingPaging;
-        this.toolbarFullTextSearch = hasToolbarFullTextSearch;
         this.parentAclId = parentAclId;
         this.aclId = aclId;
         this.aclTitle = aclTitle;
@@ -285,15 +281,6 @@ public boolean hasToolbarListingPaging() {
         return toolbarListingPaging;
     }
 
-    /**
-     * Check if has toolbar fulltext search.
-     *
-     * @return boolean
-     */
-    public boolean hasToolbarFullTextSearch() {
-        return toolbarFullTextSearch;
-    }
-
     /**
      * Get parent acl id.
      *

diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEntityDialog.form b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEntityDialog.form
@@ -46,9 +46,6 @@
                 <properties>
                   <text value=""/>
                 </properties>
-                <clientProperties>
-                  <promptText class="java.lang.String" value="EntityName"/>
-                </clientProperties>
               </component>
               <component id="5f234" class="javax.swing.JTextField" binding="dbTableName">
                 <constraints>
@@ -59,9 +56,6 @@
                 <properties>
                   <text value=""/>
                 </properties>
-                <clientProperties>
-                  <promptText class="java.lang.String" value="entity_name"/>
-                </clientProperties>
               </component>
               <component id="6e23b" class="javax.swing.JLabel" binding="dbTableNameLabel">
                 <constraints>
@@ -80,9 +74,6 @@
                 <properties>
                   <text value="entity_id"/>
                 </properties>
-                <clientProperties>
-                  <promptText class="java.lang.String" value="entity_id"/>
-                </clientProperties>
               </component>
               <component id="c37c7" class="javax.swing.JLabel" binding="entityIdColumnNameLabel">
                 <constraints>
@@ -203,9 +194,6 @@
                   </grid>
                 </constraints>
                 <properties/>
-                <clientProperties>
-                  <promptText class="java.lang.String" value="entity_name"/>
-                </clientProperties>
               </component>
               <component id="fec21" class="javax.swing.JLabel" binding="routeLabel">
                 <constraints>
@@ -264,9 +252,6 @@
                     <properties>
                       <text value=""/>
                     </properties>
-                    <clientProperties>
-                      <promptText class="java.lang.String" value="entity_form"/>
-                    </clientProperties>
                   </component>
                   <component id="24c0b" class="javax.swing.JLabel" binding="formNameErrorMessage">
                     <constraints>
@@ -294,9 +279,6 @@
                       </grid>
                     </constraints>
                     <properties/>
-                    <clientProperties>
-                      <promptText class="java.lang.String" value="entity_listing"/>
-                    </clientProperties>
                   </component>
                   <component id="774bf" class="javax.swing.JLabel" binding="gridNameErrorMessage">
                     <constraints>
@@ -327,15 +309,6 @@
                   <text resource-bundle="magento2/common" key="common.addToolbarListingPaging"/>
                 </properties>
               </component>
-              <component id="a95ed" class="javax.swing.JCheckBox" binding="addFullTextSearchCheckBox" default-binding="true">
-                <constraints>
-                  <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties>
-                  <selected value="true"/>
-                  <text resource-bundle="magento2/common" key="common.addToolbarFullTextSearch"/>
-                </properties>
-              </component>
               <component id="de501" class="javax.swing.JCheckBox" binding="addColumnsControlCheckBox" default-binding="true">
                 <constraints>
                   <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
@@ -447,9 +420,6 @@
                       <inheritsPopupMenu value="false"/>
                       <margin top="2" left="6" bottom="2" right="6"/>
                     </properties>
-                    <clientProperties>
-                      <promptText class="java.lang.String" value="Vendor_Module::management"/>
-                    </clientProperties>
                   </component>
                   <component id="34ebf" class="javax.swing.JLabel" binding="aclErrorMessage">
                     <constraints>
@@ -548,9 +518,6 @@
                       </grid>
                     </constraints>
                     <properties/>
-                    <clientProperties>
-                      <promptText class="java.lang.String" value="Vendor_Module::management"/>
-                    </clientProperties>
                   </component>
                   <component id="2ecdc" class="javax.swing.JLabel" binding="menuIdentifierErrorMessage">
                     <constraints>
@@ -678,4 +645,4 @@
   <inspectionSuppressions>
     <suppress inspection="InvalidPropertyKeyForm" id="3fe2b"/>
   </inspectionSuppressions>
-</form>
+</form>
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEntityDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEntityDialog.java
@@ -123,7 +123,6 @@ public class NewEntityDialog extends AbstractDialog {
     private JCheckBox addToolBar;
     private JCheckBox addBookmarksCheckBox;
     private JCheckBox addColumnsControlCheckBox;
-    private JCheckBox addFullTextSearchCheckBox;
     private JCheckBox addListingFiltersCheckBox;
     private JCheckBox addListingPagingCheckBox;
     private JComboBox<ComboBoxItemData> tableEngine;
@@ -740,7 +739,6 @@ private NewEntityDialogData getNewEntityDialogData() {
                 addColumnsControlCheckBox.isSelected(),
                 addListingFiltersCheckBox.isSelected(),
                 addListingPagingCheckBox.isSelected(),
-                addFullTextSearchCheckBox.isSelected(),
                 getParentAcl(),
                 acl.getText().trim(),
                 aclTitle.getText().trim(),