Skip to content

Commit 35aa247

Browse files
VitaliyBoykoVitaliyBoyko
committed
Merge remote-tracking branch 'origin/5.4.0-develop' into 2025.0.0-release
2 parents df865ab + 10d6165 commit 35aa247

File tree

17 files changed

+80
-214
lines changed

17 files changed

+80
-214
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
99
### Added
1010

1111
- Clear notifications for the process status of URN generation [#2486](https://github.com/magento/magento2-phpstorm-plugin/pull/2486)
12+
- Added array as a type in Data Model properties [#2488](https://github.com/magento/magento2-phpstorm-plugin/pull/2488)
1213

1314
### Fixed
1415

@@ -18,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
1819
Updated Run command.
1920
- java.lang.Throwable: Assertion failed: Do not use PsiElement for popup model. See PsiTargetNavigator [#2485](https://github.com/magento/magento2-phpstorm-plugin/pull/2485)
2021
- Slow operations are prohibited on EDT [#2486](https://github.com/magento/magento2-phpstorm-plugin/pull/2486)
22+
- When creating a new model with a listing component grid, fulltext search is not working [#2037](https://github.com/magento/magento2-phpstorm-plugin/pull/2037)
2123

2224
### Changed
2325

‎src/main/java/com/magento/idea/magento2plugin/actions/generation/data/UiComponentGridToolbarData.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ public class UiComponentGridToolbarData {
1010
private final boolean addToolbar;
1111
private final boolean addBookmarks;
1212
private final boolean addColumnsControls;
13-
private final boolean addFulltextSearch;
1413
private final boolean addListingFilters;
1514
private final boolean addListingPaging;
1615

@@ -20,22 +19,19 @@ public class UiComponentGridToolbarData {
2019
* @param addToolbar Add toolbar
2120
* @param addBookmarks Add bookmarks
2221
* @param addColumnsControls Add columns controls
23-
* @param addFulltextSearch Add fulltext search
2422
* @param addListingFilters Add listing filters
2523
* @param addListingPaging Add listing paging
2624
*/
2725
public UiComponentGridToolbarData(
2826
final boolean addToolbar,
2927
final boolean addBookmarks,
3028
final boolean addColumnsControls,
31-
final boolean addFulltextSearch,
3229
final boolean addListingFilters,
3330
final boolean addListingPaging
3431
) {
3532
this.addToolbar = addToolbar;
3633
this.addBookmarks = addBookmarks;
3734
this.addColumnsControls = addColumnsControls;
38-
this.addFulltextSearch = addFulltextSearch;
3935
this.addListingFilters = addListingFilters;
4036
this.addListingPaging = addListingPaging;
4137
}
@@ -76,15 +72,6 @@ public boolean isAddColumnsControls() {
7672
return addColumnsControls;
7773
}
7874

79-
/**
80-
* Is add fulltext search.
81-
*
82-
* @return Boolean
83-
*/
84-
public boolean isAddFulltextSearch() {
85-
return addFulltextSearch;
86-
}
87-
8875
/**
8976
* Is add listing filters.
9077
*

‎src/main/java/com/magento/idea/magento2plugin/actions/generation/data/converter/newentitydialog/UiComponentGridToolbarDtoConverter.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public UiComponentGridToolbarDtoConverter(
2929
newEntityDialogData.hasToolbar(),
3030
newEntityDialogData.hasToolbarBookmarks(),
3131
newEntityDialogData.hasToolbarColumnsControl(),
32-
newEntityDialogData.hasToolbarFullTextSearch(),
3332
newEntityDialogData.hasToolbarListingFilters(),
3433
newEntityDialogData.hasToolbarListingPaging()
3534

‎src/main/java/com/magento/idea/magento2plugin/actions/generation/data/dialog/NewEntityDialogData.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public class NewEntityDialogData implements DialogData {
3030
private final boolean toolbarColumnsControl;
3131
private final boolean toolbarListingFilters;
3232
private final boolean toolbarListingPaging;
33-
private final boolean toolbarFullTextSearch;
3433

3534
// Acl tab data.
3635
private final String parentAclId;
@@ -66,7 +65,6 @@ public class NewEntityDialogData implements DialogData {
6665
* @param hasToolbarColumnsControl boolean
6766
* @param hasToolbarListingFilters boolean
6867
* @param hasToolbarListingPaging boolean
69-
* @param hasToolbarFullTextSearch boolean
7068
* @param parentAclId String
7169
* @param aclId String
7270
* @param aclTitle String
@@ -94,7 +92,6 @@ public NewEntityDialogData(
9492
final boolean hasToolbarColumnsControl,
9593
final boolean hasToolbarListingFilters,
9694
final boolean hasToolbarListingPaging,
97-
final boolean hasToolbarFullTextSearch,
9895
final @NotNull String parentAclId,
9996
final @NotNull String aclId,
10097
final @NotNull String aclTitle,
@@ -121,7 +118,6 @@ public NewEntityDialogData(
121118
this.toolbarColumnsControl = hasToolbarColumnsControl;
122119
this.toolbarListingFilters = hasToolbarListingFilters;
123120
this.toolbarListingPaging = hasToolbarListingPaging;
124-
this.toolbarFullTextSearch = hasToolbarFullTextSearch;
125121
this.parentAclId = parentAclId;
126122
this.aclId = aclId;
127123
this.aclTitle = aclTitle;
@@ -285,15 +281,6 @@ public boolean hasToolbarListingPaging() {
285281
return toolbarListingPaging;
286282
}
287283

288-
/**
289-
* Check if has toolbar fulltext search.
290-
*
291-
* @return boolean
292-
*/
293-
public boolean hasToolbarFullTextSearch() {
294-
return toolbarFullTextSearch;
295-
}
296-
297284
/**
298285
* Get parent acl id.
299286
*

‎src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewEntityDialog.form‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@
4646
<properties>
4747
<text value=""/>
4848
</properties>
49-
<clientProperties>
50-
<promptText class="java.lang.String" value="EntityName"/>
51-
</clientProperties>
5249
</component>
5350
<component id="5f234" class="javax.swing.JTextField" binding="dbTableName">
5451
<constraints>
@@ -59,9 +56,6 @@
5956
<properties>
6057
<text value=""/>
6158
</properties>
62-
<clientProperties>
63-
<promptText class="java.lang.String" value="entity_name"/>
64-
</clientProperties>
6559
</component>
6660
<component id="6e23b" class="javax.swing.JLabel" binding="dbTableNameLabel">
6761
<constraints>
@@ -80,9 +74,6 @@
8074
<properties>
8175
<text value="entity_id"/>
8276
</properties>
83-
<clientProperties>
84-
<promptText class="java.lang.String" value="entity_id"/>
85-
</clientProperties>
8677
</component>
8778
<component id="c37c7" class="javax.swing.JLabel" binding="entityIdColumnNameLabel">
8879
<constraints>
@@ -203,9 +194,6 @@
203194
</grid>
204195
</constraints>
205196
<properties/>
206-
<clientProperties>
207-
<promptText class="java.lang.String" value="entity_name"/>
208-
</clientProperties>
209197
</component>
210198
<component id="fec21" class="javax.swing.JLabel" binding="routeLabel">
211199
<constraints>
@@ -264,9 +252,6 @@
264252
<properties>
265253
<text value=""/>
266254
</properties>
267-
<clientProperties>
268-
<promptText class="java.lang.String" value="entity_form"/>
269-
</clientProperties>
270255
</component>
271256
<component id="24c0b" class="javax.swing.JLabel" binding="formNameErrorMessage">
272257
<constraints>
@@ -294,9 +279,6 @@
294279
</grid>
295280
</constraints>
296281
<properties/>
297-
<clientProperties>
298-
<promptText class="java.lang.String" value="entity_listing"/>
299-
</clientProperties>
300282
</component>
301283
<component id="774bf" class="javax.swing.JLabel" binding="gridNameErrorMessage">
302284
<constraints>
@@ -327,15 +309,6 @@
327309
<text resource-bundle="magento2/common" key="common.addToolbarListingPaging"/>
328310
</properties>
329311
</component>
330-
<component id="a95ed" class="javax.swing.JCheckBox" binding="addFullTextSearchCheckBox" default-binding="true">
331-
<constraints>
332-
<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"/>
333-
</constraints>
334-
<properties>
335-
<selected value="true"/>
336-
<text resource-bundle="magento2/common" key="common.addToolbarFullTextSearch"/>
337-
</properties>
338-
</component>
339312
<component id="de501" class="javax.swing.JCheckBox" binding="addColumnsControlCheckBox" default-binding="true">
340313
<constraints>
341314
<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 @@
447420
<inheritsPopupMenu value="false"/>
448421
<margin top="2" left="6" bottom="2" right="6"/>
449422
</properties>
450-
<clientProperties>
451-
<promptText class="java.lang.String" value="Vendor_Module::management"/>
452-
</clientProperties>
453423
</component>
454424
<component id="34ebf" class="javax.swing.JLabel" binding="aclErrorMessage">
455425
<constraints>
@@ -548,9 +518,6 @@
548518
</grid>
549519
</constraints>
550520
<properties/>
551-
<clientProperties>
552-
<promptText class="java.lang.String" value="Vendor_Module::management"/>
553-
</clientProperties>
554521
</component>
555522
<component id="2ecdc" class="javax.swing.JLabel" binding="menuIdentifierErrorMessage">
556523
<constraints>
@@ -678,4 +645,4 @@
678645
<inspectionSuppressions>
679646
<suppress inspection="InvalidPropertyKeyForm" id="3fe2b"/>
680647
</inspectionSuppressions>
681-
</form>
648+
</form>

‎src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewEntityDialog.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ public class NewEntityDialog extends AbstractDialog {
123123
private JCheckBox addToolBar;
124124
private JCheckBox addBookmarksCheckBox;
125125
private JCheckBox addColumnsControlCheckBox;
126-
private JCheckBox addFullTextSearchCheckBox;
127126
private JCheckBox addListingFiltersCheckBox;
128127
private JCheckBox addListingPagingCheckBox;
129128
private JComboBox<ComboBoxItemData> tableEngine;
@@ -740,7 +739,6 @@ private NewEntityDialogData getNewEntityDialogData() {
740739
addColumnsControlCheckBox.isSelected(),
741740
addListingFiltersCheckBox.isSelected(),
742741
addListingPagingCheckBox.isSelected(),
743-
addFullTextSearchCheckBox.isSelected(),
744742
getParentAcl(),
745743
acl.getText().trim(),
746744
aclTitle.getText().trim(),

0 commit comments

Comments
 (0)