Skip to content

Commit 9d6aeb1

Browse files
author
Hwashiang Yu
committed
MC-412: Advanced tab in content types required validation
- Removed testing configuration - Updated logic to use util method to check for empty values
1 parent 55897b4 commit 9d6aeb1

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_row_form.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,11 +344,6 @@
344344
<item name="default" xsi:type="string">{"margin":{"bottom":"10","left":"0","right":"0","top":"0"},"padding":{"bottom":"10","left":"10","right":"10","top":"10"}}</item>
345345
</item>
346346
</argument>
347-
<settings>
348-
<validation>
349-
<rule name="required-entry" xsi:type="boolean">true</rule>
350-
</validation>
351-
</settings>
352347
</field>
353348
</fieldset>
354349
</form>

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/validator-rules-mixin.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,19 @@ define([
9898
validator.addRule(
9999
'required-entry',
100100
function (value) {
101+
var allFilled = true;
102+
101103
if (typeof value !== 'object') {
102104
return requiredInputRule.handler(value);
103105
}
104-
return !_.contains(_.flatten(_.map(value, _.values)), "");
106+
107+
_.flatten(_.map(value, _.values)).forEach(function(val) {
108+
if (utils.isEmpty(val)) {
109+
return allFilled = false;
110+
}
111+
});
112+
113+
return allFilled;
105114
},
106115
$.mage.__(requiredInputRule.message)
107116
);

0 commit comments

Comments
 (0)