Skip to content

Commit cfd6d98

Browse files
committed
27550 fixed UX issue for Page/Block grid
1 parent 562644f commit cfd6d98

File tree

2 files changed

+8
-81
lines changed

2 files changed

+8
-81
lines changed

app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -96,22 +96,13 @@
9696
</listingToolbar>
9797
<columns name="cms_block_columns">
9898
<settings>
99-
<editorConfig>
100-
<param name="clientConfig" xsi:type="array">
101-
<item name="saveUrl" xsi:type="url" path="cms/block/inlineEdit"/>
102-
<item name="validateBeforeSave" xsi:type="boolean">false</item>
103-
</param>
104-
<param name="indexField" xsi:type="string">block_id</param>
105-
<param name="enabled" xsi:type="boolean">true</param>
106-
<param name="selectProvider" xsi:type="string">cms_block_listing.cms_block_listing.cms_block_columns.ids</param>
107-
</editorConfig>
10899
<childDefaults>
109100
<param name="fieldAction" xsi:type="array">
110-
<item name="provider" xsi:type="string">cms_block_listing.cms_block_listing.cms_block_columns_editor</item>
111-
<item name="target" xsi:type="string">startEdit</item>
101+
<item name="provider" xsi:type="string">cms_block_listing.cms_block_listing.cms_block_columns.actions</item>
102+
<item name="target" xsi:type="string">applyAction</item>
112103
<item name="params" xsi:type="array">
113-
<item name="0" xsi:type="string">${ $.$data.rowIndex }</item>
114-
<item name="1" xsi:type="boolean">true</item>
104+
<item name="0" xsi:type="string">edit</item>
105+
<item name="1" xsi:type="string">${ $.$data.rowIndex }</item>
115106
</item>
116107
</param>
117108
</childDefaults>
@@ -131,25 +122,12 @@
131122
<column name="title">
132123
<settings>
133124
<filter>text</filter>
134-
<editor>
135-
<validation>
136-
<rule name="required-entry" xsi:type="boolean">true</rule>
137-
</validation>
138-
<editorType>text</editorType>
139-
</editor>
140125
<label translate="true">Title</label>
141126
</settings>
142127
</column>
143128
<column name="identifier">
144129
<settings>
145130
<filter>text</filter>
146-
<editor>
147-
<validation>
148-
<rule name="required-entry" xsi:type="boolean">true</rule>
149-
<rule name="no-marginal-whitespace" xsi:type="boolean">true</rule>
150-
</validation>
151-
<editorType>text</editorType>
152-
</editor>
153131
<label translate="true">Identifier</label>
154132
</settings>
155133
</column>
@@ -164,9 +142,6 @@
164142
<settings>
165143
<options class="Magento\Cms\Model\Block\Source\IsActive"/>
166144
<filter>select</filter>
167-
<editor>
168-
<editorType>select</editorType>
169-
</editor>
170145
<dataType>select</dataType>
171146
<label translate="true">Status</label>
172147
</settings>

app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml

Lines changed: 4 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -115,22 +115,13 @@
115115
</listingToolbar>
116116
<columns name="cms_page_columns">
117117
<settings>
118-
<editorConfig>
119-
<param name="clientConfig" xsi:type="array">
120-
<item name="saveUrl" xsi:type="url" path="cms/page/inlineEdit"/>
121-
<item name="validateBeforeSave" xsi:type="boolean">false</item>
122-
</param>
123-
<param name="indexField" xsi:type="string">page_id</param>
124-
<param name="enabled" xsi:type="boolean">true</param>
125-
<param name="selectProvider" xsi:type="string">cms_page_listing.cms_page_listing.cms_page_columns.ids</param>
126-
</editorConfig>
127118
<childDefaults>
128119
<param name="fieldAction" xsi:type="array">
129-
<item name="provider" xsi:type="string">cms_page_listing.cms_page_listing.cms_page_columns_editor</item>
130-
<item name="target" xsi:type="string">startEdit</item>
120+
<item name="provider" xsi:type="string">cms_page_listing.cms_page_listing.cms_page_columns.actions</item>
121+
<item name="target" xsi:type="string">applyAction</item>
131122
<item name="params" xsi:type="array">
132-
<item name="0" xsi:type="string">${ $.$data.rowIndex }</item>
133-
<item name="1" xsi:type="boolean">true</item>
123+
<item name="0" xsi:type="string">edit</item>
124+
<item name="1" xsi:type="string">${ $.$data.rowIndex }</item>
134125
</item>
135126
</param>
136127
</childDefaults>
@@ -152,34 +143,19 @@
152143
<column name="title">
153144
<settings>
154145
<filter>text</filter>
155-
<editor>
156-
<validation>
157-
<rule name="required-entry" xsi:type="boolean">true</rule>
158-
</validation>
159-
<editorType>text</editorType>
160-
</editor>
161146
<label translate="true">Title</label>
162147
</settings>
163148
</column>
164149
<column name="identifier">
165150
<settings>
166151
<filter>text</filter>
167-
<editor>
168-
<validation>
169-
<rule name="validate-identifier" xsi:type="boolean">true</rule>
170-
</validation>
171-
<editorType>text</editorType>
172-
</editor>
173152
<label translate="true">URL Key</label>
174153
</settings>
175154
</column>
176155
<column name="page_layout" component="Magento_Ui/js/grid/columns/select">
177156
<settings>
178157
<options class="Magento\Cms\Model\Page\Source\PageLayout"/>
179158
<filter>select</filter>
180-
<editor>
181-
<editorType>select</editorType>
182-
</editor>
183159
<dataType>select</dataType>
184160
<label translate="true">Layout</label>
185161
</settings>
@@ -195,9 +171,6 @@
195171
<settings>
196172
<options class="Magento\Cms\Model\Page\Source\IsActive"/>
197173
<filter>select</filter>
198-
<editor>
199-
<editorType>select</editorType>
200-
</editor>
201174
<dataType>select</dataType>
202175
<label translate="true">Status</label>
203176
</settings>
@@ -221,9 +194,6 @@
221194
<timezone>false</timezone>
222195
<dateFormat>MMM d, y</dateFormat>
223196
<filter>dateRange</filter>
224-
<editor>
225-
<editorType>date</editorType>
226-
</editor>
227197
<dataType>date</dataType>
228198
<label translate="true">Custom design from</label>
229199
<visible>false</visible>
@@ -234,9 +204,6 @@
234204
<timezone>false</timezone>
235205
<dateFormat>MMM d, y</dateFormat>
236206
<filter>dateRange</filter>
237-
<editor>
238-
<editorType>date</editorType>
239-
</editor>
240207
<dataType>date</dataType>
241208
<label translate="true">Custom design to</label>
242209
<visible>false</visible>
@@ -246,9 +213,6 @@
246213
<settings>
247214
<options class="Magento\Cms\Model\Page\Source\Theme"/>
248215
<filter>select</filter>
249-
<editor>
250-
<editorType>select</editorType>
251-
</editor>
252216
<dataType>select</dataType>
253217
<label translate="true">Custom Theme</label>
254218
<visible>false</visible>
@@ -258,9 +222,6 @@
258222
<settings>
259223
<options class="Magento\Cms\Model\Page\Source\CustomLayout"/>
260224
<filter>select</filter>
261-
<editor>
262-
<editorType>select</editorType>
263-
</editor>
264225
<dataType>select</dataType>
265226
<label translate="true">Custom Layout</label>
266227
<visible>false</visible>
@@ -269,29 +230,20 @@
269230
<column name="meta_title">
270231
<settings>
271232
<filter>text</filter>
272-
<editor>
273-
<editorType>text</editorType>
274-
</editor>
275233
<label translate="true">Meta Title</label>
276234
<visible>false</visible>
277235
</settings>
278236
</column>
279237
<column name="meta_keywords">
280238
<settings>
281239
<filter>text</filter>
282-
<editor>
283-
<editorType>text</editorType>
284-
</editor>
285240
<label translate="true">Meta Keywords</label>
286241
<visible>false</visible>
287242
</settings>
288243
</column>
289244
<column name="meta_description">
290245
<settings>
291246
<filter>text</filter>
292-
<editor>
293-
<editorType>text</editorType>
294-
</editor>
295247
<label translate="true">Meta Description</label>
296248
<visible>false</visible>
297249
</settings>

0 commit comments

Comments
 (0)