Skip to content

Commit 7c43b7f

Browse files
bohdan-harniukbohdan-harniuk
committed
879: Enhanced error outputting for new Magento 2 UI Form generation
1 parent cb5454a commit 7c43b7f

File tree

2 files changed

+145
-35
lines changed

2 files changed

+145
-35
lines changed

‎src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.form

Lines changed: 133 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<xy x="48" y="54" width="1056" height="1327"/>
77
</constraints>
88
<properties>
9-
<preferredSize width="838" height="619"/>
9+
<preferredSize width="1200" height="619"/>
1010
</properties>
1111
<border type="none"/>
1212
<children>
@@ -160,15 +160,15 @@
160160
<properties/>
161161
<border type="none"/>
162162
<children>
163-
<grid id="b7455" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
164-
<margin top="0" left="0" bottom="0" right="0"/>
163+
<grid id="b7455" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
164+
<margin top="5" left="5" bottom="5" right="5"/>
165165
<constraints>
166-
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
166+
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false">
167167
<preferred-size width="111" height="24"/>
168168
</grid>
169169
</constraints>
170170
<properties/>
171-
<border type="none"/>
171+
<border type="etched"/>
172172
<children>
173173
<component id="5b47d" class="javax.swing.JLabel" binding="submitControllerNameLabel">
174174
<constraints>
@@ -188,15 +188,15 @@
188188
</component>
189189
<component id="27a44" class="javax.swing.JLabel" binding="submitActionNameLabel">
190190
<constraints>
191-
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
191+
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
192192
</constraints>
193193
<properties>
194194
<text value="Action Name"/>
195195
</properties>
196196
</component>
197197
<component id="10c56" class="javax.swing.JTextField" binding="submitActionName">
198198
<constraints>
199-
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
199+
<grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
200200
<preferred-size width="150" height="-1"/>
201201
</grid>
202202
</constraints>
@@ -215,15 +215,31 @@
215215
<text value="Submit Controller"/>
216216
</properties>
217217
</component>
218+
<component id="9d629" class="javax.swing.JLabel" binding="submitControllerNameErrorMessage">
219+
<constraints>
220+
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
221+
</constraints>
222+
<properties>
223+
<text value=""/>
224+
</properties>
225+
</component>
226+
<component id="5ec73" class="javax.swing.JLabel" binding="submitActionNameErrorMessage">
227+
<constraints>
228+
<grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
229+
</constraints>
230+
<properties>
231+
<text value=""/>
232+
</properties>
233+
</component>
218234
</children>
219235
</grid>
220-
<grid id="9e75f" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
221-
<margin top="0" left="0" bottom="0" right="0"/>
236+
<grid id="9e75f" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
237+
<margin top="5" left="5" bottom="5" right="5"/>
222238
<constraints>
223-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
239+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
224240
</constraints>
225241
<properties/>
226-
<border type="none"/>
242+
<border type="etched"/>
227243
<children>
228244
<component id="6f1b" class="javax.swing.JLabel" binding="controllerNameLabel">
229245
<constraints>
@@ -252,7 +268,7 @@
252268
</component>
253269
<component id="83537" class="javax.swing.JTextField" binding="viewActionName">
254270
<constraints>
255-
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
271+
<grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
256272
<preferred-size width="150" height="-1"/>
257273
</grid>
258274
</constraints>
@@ -262,21 +278,37 @@
262278
</component>
263279
<component id="e2e73" class="javax.swing.JLabel" binding="actionNameLabel">
264280
<constraints>
265-
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
281+
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
266282
</constraints>
267283
<properties>
268284
<text value="Action Name"/>
269285
</properties>
270286
</component>
287+
<component id="d330e" class="javax.swing.JLabel" binding="viewControllerNameErrorMessage">
288+
<constraints>
289+
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
290+
</constraints>
291+
<properties>
292+
<text value=""/>
293+
</properties>
294+
</component>
295+
<component id="5eea7" class="javax.swing.JLabel" binding="viewActionNameErrorMessage">
296+
<constraints>
297+
<grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
298+
</constraints>
299+
<properties>
300+
<text value=""/>
301+
</properties>
302+
</component>
271303
</children>
272304
</grid>
273-
<grid id="1d774" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
274-
<margin top="0" left="0" bottom="0" right="0"/>
305+
<grid id="1d774" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
306+
<margin top="5" left="5" bottom="5" right="5"/>
275307
<constraints>
276-
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
308+
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
277309
</constraints>
278310
<properties/>
279-
<border type="none"/>
311+
<border type="etched"/>
280312
<children>
281313
<component id="a4ba5" class="javax.swing.JLabel" binding="dataProviderLabel">
282314
<constraints>
@@ -310,22 +342,38 @@
310342
</component>
311343
<component id="bda59" class="javax.swing.JLabel" binding="dataProviderDirectoryLabel">
312344
<constraints>
313-
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
345+
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
314346
</constraints>
315347
<properties>
316348
<text value="Directory"/>
317349
</properties>
318350
</component>
319351
<component id="b7ea3" class="javax.swing.JTextField" binding="dataProviderDirectory">
320352
<constraints>
321-
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
353+
<grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
322354
<preferred-size width="150" height="-1"/>
323355
</grid>
324356
</constraints>
325357
<properties>
326358
<text value="Ui/Component/Form"/>
327359
</properties>
328360
</component>
361+
<component id="6424d" class="javax.swing.JLabel" binding="dataProviderClassNameErrorMessage">
362+
<constraints>
363+
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
364+
</constraints>
365+
<properties>
366+
<text value=""/>
367+
</properties>
368+
</component>
369+
<component id="92711" class="javax.swing.JLabel" binding="dataProviderDirectoryErrorMessage">
370+
<constraints>
371+
<grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
372+
</constraints>
373+
<properties>
374+
<text value=""/>
375+
</properties>
376+
</component>
329377
</children>
330378
</grid>
331379
</children>
@@ -338,25 +386,25 @@
338386
<properties/>
339387
<border type="none"/>
340388
<children>
341-
<grid id="c8f38" layout-manager="GridLayoutManager" row-count="2" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
342-
<margin top="0" left="0" bottom="0" right="0"/>
389+
<grid id="c8f38" layout-manager="GridLayoutManager" row-count="4" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
390+
<margin top="5" left="5" bottom="5" right="5"/>
343391
<constraints>
344-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
392+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
345393
</constraints>
346394
<properties/>
347-
<border type="none"/>
395+
<border type="etched"/>
348396
<children>
349397
<component id="ad25c" class="javax.swing.JLabel">
350398
<constraints>
351-
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
399+
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
352400
</constraints>
353401
<properties>
354402
<text resource-bundle="magento2/common" key="common.area.target"/>
355403
</properties>
356404
</component>
357405
<component id="b8894" class="com.magento.idea.magento2plugin.ui.FilteredComboBox" binding="formAreaSelect" custom-create="true">
358406
<constraints>
359-
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
407+
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
360408
</constraints>
361409
<properties>
362410
<toolTipText value=""/>
@@ -375,7 +423,7 @@
375423
</component>
376424
<component id="d41b5" class="javax.swing.JTextField" binding="route">
377425
<constraints>
378-
<grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
426+
<grid row="2" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
379427
<preferred-size width="150" height="-1"/>
380428
</grid>
381429
</constraints>
@@ -385,7 +433,7 @@
385433
</component>
386434
<component id="9bed8" class="javax.swing.JLabel" binding="routeLabel">
387435
<constraints>
388-
<grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
436+
<grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
389437
</constraints>
390438
<properties>
391439
<text value="Route"/>
@@ -417,17 +465,43 @@
417465
<text value="Label"/>
418466
</properties>
419467
</component>
468+
<component id="3c2cc" class="javax.swing.JLabel" binding="formLabelErrorMessage">
469+
<constraints>
470+
<grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
471+
</constraints>
472+
<properties>
473+
<text value=""/>
474+
</properties>
475+
</component>
476+
<component id="ab07" class="javax.swing.JLabel" binding="formNameErrorMessage">
477+
<constraints>
478+
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
479+
</constraints>
480+
<properties>
481+
<text value=""/>
482+
</properties>
483+
</component>
484+
<component id="dfd51" class="javax.swing.JLabel" binding="routeErrorMessage">
485+
<constraints>
486+
<grid row="3" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
487+
</constraints>
488+
<properties>
489+
<text value=""/>
490+
</properties>
491+
</component>
420492
</children>
421493
</grid>
422494
</children>
423495
</grid>
424-
<grid id="b8234" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
425-
<margin top="0" left="0" bottom="0" right="0"/>
496+
<grid id="b8234" layout-manager="GridLayoutManager" row-count="6" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
497+
<margin top="5" left="5" bottom="5" right="5"/>
426498
<constraints>
427-
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
499+
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
428500
</constraints>
429501
<properties/>
430-
<border type="none"/>
502+
<border type="etched">
503+
<title-color color="-4473925"/>
504+
</border>
431505
<children>
432506
<component id="8ab6a" class="javax.swing.JTextField" binding="acl">
433507
<constraints>
@@ -447,34 +521,58 @@
447521
</component>
448522
<component id="5940c" class="javax.swing.JLabel">
449523
<constraints>
450-
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
524+
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
451525
</constraints>
452526
<properties>
453527
<text value="Parent ACL ID"/>
454528
</properties>
455529
</component>
456530
<component id="4d7d5" class="javax.swing.JTextField" binding="aclTitle">
457531
<constraints>
458-
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
532+
<grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
459533
<preferred-size width="150" height="-1"/>
460534
</grid>
461535
</constraints>
462536
<properties/>
463537
</component>
464538
<component id="7fac6" class="javax.swing.JLabel">
465539
<constraints>
466-
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
540+
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
467541
</constraints>
468542
<properties>
469543
<text value="ACL Title"/>
470544
</properties>
471545
</component>
472546
<component id="3d9d9" class="com.magento.idea.magento2plugin.ui.FilteredComboBox" binding="parentAcl" custom-create="true">
473547
<constraints>
474-
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
548+
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
475549
</constraints>
476550
<properties/>
477551
</component>
552+
<component id="d44fd" class="javax.swing.JLabel" binding="aclErrorMessage">
553+
<constraints>
554+
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
555+
</constraints>
556+
<properties>
557+
<text value=""/>
558+
</properties>
559+
</component>
560+
<component id="b2656" class="javax.swing.JLabel" binding="parentAclErrorMessage">
561+
<constraints>
562+
<grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
563+
</constraints>
564+
<properties>
565+
<text value=""/>
566+
</properties>
567+
</component>
568+
<component id="4aea0" class="javax.swing.JLabel" binding="aclTitleErrorMessage">
569+
<constraints>
570+
<grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
571+
</constraints>
572+
<properties>
573+
<text value=""/>
574+
</properties>
575+
</component>
478576
</children>
479577
</grid>
480578
</children>

0 commit comments

Comments
 (0)