Skip to content

Commit a1558f6

Browse files
cspruiellcspruiell
committed
PB-107: Display total number of products matched into ProductsList
 - populate total number of products
1 parent ec2d10d commit a1558f6

File tree

4 files changed

+15
-55
lines changed

4 files changed

+15
-55
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Data/ProductsData.xml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -163,19 +163,16 @@
163163
<data key="errorMessage">This is a required field.</data>
164164
</entity>
165165
<entity name="PageBuilderTotalProductsPropertyThree" type="pagebuilder_products_grid_total_products">
166-
<data key="name"></data>
167166
<data key="section">appearance_fieldset</data>
168167
<data key="fieldName">product_totals</data>
169168
<data key="value">of 3 (0 disabled)</data>
170169
</entity>
171170
<entity name="PageBuilderTotalProductsPropertyOne" type="pagebuilder_products_grid_total_products">
172-
<data key="name"></data>
173171
<data key="section">appearance_fieldset</data>
174172
<data key="fieldName">product_totals</data>
175173
<data key="value">of 1 (0 disabled)</data>
176174
</entity>
177175
<entity name="PageBuilderTotalProductsPropertyTwoOneDisabled" type="pagebuilder_products_grid_total_products">
178-
<data key="name"></data>
179176
<data key="section">appearance_fieldset</data>
180177
<data key="fieldName">product_totals</data>
181178
<data key="value">of 2 (1 disabled)</data>
@@ -251,24 +248,6 @@
251248
<data key="value"/>
252249
<data key="errorMessage">This is a required field.</data>
253250
</entity>
254-
<entity name="PageBuilderProductsCarouselTotalProductsPropertyThree" type="pagebuilder_products_grid_total_products">
255-
<data key="name"></data>
256-
<data key="section">appearance_fieldset</data>
257-
<data key="fieldName">carousel_product_totals</data>
258-
<data key="value">of 3 (0 disabled)</data>
259-
</entity>
260-
<entity name="PageBuilderProductsCarouselTotalProductsPropertyOne" type="pagebuilder_products_grid_total_products">
261-
<data key="name"></data>
262-
<data key="section">appearance_fieldset</data>
263-
<data key="fieldName">carousel_product_totals</data>
264-
<data key="value">of 1 (0 disabled)</data>
265-
</entity>
266-
<entity name="PageBuilderProductsCarouselTotalProductsPropertyTwoOneDisabled" type="pagebuilder_products_grid_total_products">
267-
<data key="name"></data>
268-
<data key="section">appearance_fieldset</data>
269-
<data key="fieldName">carousel_product_totals</data>
270-
<data key="value">of 2 (1 disabled)</data>
271-
</entity>
272251
<!-- Carousel Settings: Carousel Mode -->
273252
<entity name="PageBuilderProductsCarouselSettingsCarouselMode_Default" type="pagebuilder_products_carousel_mode">
274253
<data key="name">Autoplay</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTests.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,7 +1181,7 @@
11811181
<argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
11821182
</actionGroup>
11831183
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsForCategoryAndCarousel">
1184-
<argument name="property" value="PageBuilderProductsCarouselTotalProductsPropertyThree"/>
1184+
<argument name="property" value="PageBuilderTotalProductsPropertyThree"/>
11851185
</actionGroup>
11861186
<!-- Select Products By Sku -->
11871187
<actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsBySku">
@@ -1192,7 +1192,7 @@
11921192
</actionGroup>
11931193
<!-- Verify Total Products by Sku for Carousel Appearance -->
11941194
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsForSkusAndCarousel">
1195-
<argument name="property" value="PageBuilderProductsCarouselTotalProductsPropertyTwoOneDisabled"/>
1195+
<argument name="property" value="PageBuilderTotalProductsPropertyTwoOneDisabled"/>
11961196
</actionGroup>
11971197
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsForSkuAndCarousel"/>
11981198
<!-- Validate Stage -->
@@ -1236,7 +1236,7 @@
12361236
<argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
12371237
</actionGroup>
12381238
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsForConditionAndCarousel">
1239-
<argument name="property" value="PageBuilderProductsCarouselTotalProductsPropertyOne"/>
1239+
<argument name="property" value="PageBuilderTotalProductsPropertyOne"/>
12401240
</actionGroup>
12411241
</test>
12421242
</tests>

‎app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_products_carousel_form.xml

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@
3939
</item>
4040
</argument>
4141
</field>
42-
<field name="product_count_group" sortOrder="20" formElement="input">
43-
<argument name="data" xsi:type="array">
44-
<item name="config" xsi:type="array">
45-
<item name="componentDisabled" xsi:type="boolean">true</item>
46-
</item>
47-
</argument>
48-
</field>
4942
<htmlContent name="conditions_form" sortOrder="30" template="Magento_PageBuilder/form/element/widget-conditions">
5043
<block name="conditions_form" class="Magento\PageBuilder\Block\Adminhtml\Form\Element\ProductConditions">
5144
<arguments>
@@ -55,12 +48,14 @@
5548
</arguments>
5649
</block>
5750
</htmlContent>
58-
<container name="carousel_product_count_group" component="Magento_Ui/js/form/components/group" sortOrder="80">
59-
<argument name="data" xsi:type="array">
60-
<item name="config" xsi:type="array">
61-
<item name="breakLine" xsi:type="boolean">false</item>
62-
</item>
63-
</argument>
51+
<container name="product_count_group" component="Magento_Ui/js/form/components/group" sortOrder="80">
52+
<field name="products_count" sortOrder="20" formElement="input">
53+
<argument name="data" xsi:type="array">
54+
<item name="config" xsi:type="array">
55+
<item name="componentDisabled" xsi:type="boolean">true</item>
56+
</item>
57+
</argument>
58+
</field>
6459
<field name="carousel_products_count" sortOrder="10" formElement="input">
6560
<argument name="data" xsi:type="array">
6661
<item name="config" xsi:type="array">
@@ -82,24 +77,6 @@
8277
</validation>
8378
</settings>
8479
</field>
85-
<field name="carousel_product_totals" sortOrder="20" formElement="input" component="Magento_PageBuilder/js/form/element/product-totals">
86-
<argument name="data" xsi:type="array">
87-
<item name="config" xsi:type="array">
88-
<item name="default" xsi:type="string">of ${ $.totalProductCount } (${ $.totalDisabledProducts } disabled)</item>
89-
<item name="url" xsi:type="url" path="pagebuilder/form/element_producttotals"/>
90-
</item>
91-
</argument>
92-
<settings>
93-
<elementTmpl>ui/form/element/text</elementTmpl>
94-
<dataType>text</dataType>
95-
<imports>
96-
<link name="conditionOption">ns = ${ $.ns }, index = condition_option:value</link>
97-
<link name="updateProductTotals">ns = ${ $.ns }, index = category_ids:value</link>
98-
<link name="updateProductTotals">ns = ${ $.ns }, index = sku:value</link>
99-
<link name="conditionValue">ns = ${ $.ns }, index = conditions_form:value</link>
100-
</imports>
101-
</settings>
102-
</field>
10380
</container>
10481
</fieldset>
10582
<fieldset name="settings" sortOrder="30">

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/product-totals.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ define([
4949
return;
5050
}
5151

52+
if (this.conditionOption === 'category_ids' && typeof this.formData[this.conditionOption] != "string") {
53+
this.formData[this.conditionOption] = '';
54+
}
55+
5256
_.extend(this.formData, this.conditionValue);
5357
conditionsDataProcessor(this.formData, this.conditionOption + '_source');
5458

0 commit comments

Comments
 (0)