Fix j-test-id of report editor's buttons #200

jmix-projects · Aug 2, 2021 · 4065d4d · 4065d4d
1 parent 4d7bb49
commit 4065d4d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/...src/main/java/io/jmix/reportsui/screen/report/edit/tabs/ReportEditParametersFragment.java b/...src/main/java/io/jmix/reportsui/screen/report/edit/tabs/ReportEditParametersFragment.java
@@ -108,18 +108,18 @@ protected void onInputParametersTableDown(Action.ActionPerformedEvent event) {
         replaceParameters(false);
     }
 
-    @Install(to = "inputParametersTable.create", subject = "initializer")
+    @Install(to = "inputParametersTable.createParameter", subject = "initializer")
     protected void inputParametersTableCreateInitializer(ReportInputParameter reportInputParameter) {
         reportInputParameter.setReport(reportDc.getItem());
         reportInputParameter.setPosition(parametersDc.getItems().size());
     }
 
-    @Install(to = "inputParametersTable.create", subject = "afterCommitHandler")
+    @Install(to = "inputParametersTable.createParameter", subject = "afterCommitHandler")
     protected void inputParametersTableCreateAfterCommitHandler(ReportInputParameter reportInputParameter) {
 
     }
 
-    @Install(to = "inputParametersTable.remove", subject = "afterActionPerformedHandler")
+    @Install(to = "inputParametersTable.removeParameter", subject = "afterActionPerformedHandler")
     protected void inputParametersTableRemoveAfterActionPerformedHandler(RemoveOperation.AfterActionPerformedEvent<ReportInputParameter> afterActionPerformedEvent) {
         orderParameters();
     }

diff --git a/...c/main/java/io/jmix/reportsui/screen/report/edit/tabs/ReportEditValueFormatsFragment.java b/...c/main/java/io/jmix/reportsui/screen/report/edit/tabs/ReportEditValueFormatsFragment.java
@@ -32,7 +32,7 @@ public class ReportEditValueFormatsFragment extends ScreenFragment {
     @Autowired
     protected InstanceContainer<Report> reportDc;
 
-    @Install(to = "valuesFormatsTable.create", subject = "initializer")
+    @Install(to = "valuesFormatsTable.createValueFormat", subject = "initializer")
     protected void valuesFormatsTableCreateInitializer(ReportValueFormat reportValueFormat) {
         reportValueFormat.setReport(reportDc.getItem());
     }

diff --git a/...n/resources/io/jmix/reportsui/screen/report/edit/tabs/report-edit-parameters-fragment.xml b/...n/resources/io/jmix/reportsui/screen/report/edit/tabs/report-edit-parameters-fragment.xml
@@ -30,16 +30,16 @@
                reorderingAllowed="false" columnControlVisible="false"
                dataContainer="parametersDc">
             <actions>
-                <action id="create" type="create"/>
-                <action id="remove" type="remove"/>
-                <action id="edit" type="edit"/>
+                <action id="createParameter" type="create"/>
+                <action id="removeParameter" type="remove"/>
+                <action id="editParameter" type="edit"/>
                 <action id="up"/>
                 <action id="down"/>
             </actions>
             <buttonsPanel>
-                <button action="inputParametersTable.create"/>
-                <button action="inputParametersTable.edit"/>
-                <button action="inputParametersTable.remove"/>
+                <button action="inputParametersTable.createParameter"/>
+                <button action="inputParametersTable.editParameter"/>
+                <button action="inputParametersTable.removeParameter"/>
                 <button id="upButton" action="inputParametersTable.up" icon="font-icon:CARET_UP"/>
                 <button id="downButton" action="inputParametersTable.down" icon="font-icon:CARET_DOWN"/>
             </buttonsPanel>

diff --git a/...esources/io/jmix/reportsui/screen/report/edit/tabs/report-edit-value-formats-fragment.xml b/...esources/io/jmix/reportsui/screen/report/edit/tabs/report-edit-value-formats-fragment.xml
@@ -30,14 +30,14 @@
                dataContainer="valuesFormatsDc"
                reorderingAllowed="false" columnControlVisible="false">
             <actions>
-                <action id="create" type="create"/>
-                <action id="edit" type="edit"/>
-                <action id="remove" type="remove"/>
+                <action id="createValueFormat" type="create"/>
+                <action id="editValueFormat" type="edit"/>
+                <action id="removeValueFormat" type="remove"/>
             </actions>
             <buttonsPanel>
-                <button action="valuesFormatsTable.create"/>
-                <button action="valuesFormatsTable.edit"/>
-                <button action="valuesFormatsTable.remove"/>
+                <button action="valuesFormatsTable.createValueFormat"/>
+                <button action="valuesFormatsTable.editValueFormat"/>
+                <button action="valuesFormatsTable.removeValueFormat"/>
             </buttonsPanel>
             <columns>
                 <column id="valueName"/>