update grid

karliuka · Nov 30, 2018 · 3ce931d · 3ce931d
1 parent 8e4aa44
commit 3ce931d
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Extension enables you to easily use your own custom SMTP server for sending mail
 
 ## Compatibility
 
-Magento CE 2.1.x, 2.2.x
+Magento CE 2.0.x, 2.1.x, 2.2.x
 
 ## Install
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "faonni/module-smtp",
     "description": "Extension enables you to easily use your own custom SMTP server for sending mail.",
     "type": "magento2-module",
-	"version": "2.1.5",
+	"version": "2.1.6",
     "authors": [{
         "name" : "Karliuka Vitalii",
         "email": "karliuka.vitalii@gmail.com"
@@ -11,8 +11,8 @@
 		"OSL-3.0"
 	],
 	"require": {
-		"magento/module-backend": "100.1.*|100.2.*",
-		"magento/module-email": "100.1.*|100.2.*"
+		"magento/module-backend": "100.0.*|100.1.*|100.2.*",
+		"magento/module-email": "100.0.*|100.1.*|100.2.*"
 	},
 	"autoload": {
 		"files": [ 

diff --git a/etc/di.xml b/etc/di.xml
@@ -7,15 +7,11 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
-	<!--
-	plugin
-	-->		
+	<!-- plugin -->		
     <type name="\Magento\Framework\Mail\TransportInterfaceFactory">
         <plugin name="faonni_smtp" type="Faonni\Smtp\Plugin\Framework\Mail\TransportInterfaceFactory" />
     </type>
-	<!--
-	ui grid
-	-->		
+	<!-- ui grid -->		
 	<type name="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
         <arguments>
             <argument name="collections" xsi:type="array">

diff --git a/etc/module.xml b/etc/module.xml
@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Faonni_Smtp" setup_version="2.1.5">
+    <module name="Faonni_Smtp" setup_version="2.1.6">
         <sequence>
             <module name="Magento_Backend"/>
 			<module name="Magento_Email"/>

diff --git a/view/adminhtml/ui_component/faonni_smtp_log_grid.xml b/view/adminhtml/ui_component/faonni_smtp_log_grid.xml
@@ -34,35 +34,69 @@
         </argument>
     </dataSource>
     <!-- toolbar -->
-    <listingToolbar name="listing_top">
-        <bookmark name="bookmarks"/>
-        <columnsControls name="columns_controls"/>       
-        <filterSearch name="fulltext"/>
+    <container name="listing_top">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="template" xsi:type="string">ui/grid/toolbar</item>
+            </item>
+        </argument>
+        <bookmark name="bookmarks">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="storageConfig" xsi:type="array">
+                        <item name="namespace" xsi:type="string">faonni_smtp_log_grid</item>
+                    </item>
+                </item>
+            </argument>
+        </bookmark>
+        <component name="columns_controls">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="columnsData" xsi:type="array">
+                        <item name="provider" xsi:type="string">faonni_smtp_log_grid.faonni_smtp_log_grid.faonni_smtp_log_columns</item>
+                    </item>
+                    <item name="component" xsi:type="string">Magento_Ui/js/grid/controls/columns</item>
+                    <item name="displayArea" xsi:type="string">dataGridActions</item>
+                </item>
+            </argument>
+        </component>
+        <filterSearch name="fulltext">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="provider" xsi:type="string">faonni_smtp_log_grid.faonni_smtp_log_grid_data_source</item>
+                    <item name="chipsProvider" xsi:type="string">faonni_smtp_log_grid.faonni_smtp_log_grid.listing_top.listing_filters_chips</item>
+                    <item name="storageConfig" xsi:type="array">
+                        <item name="provider" xsi:type="string">faonni_smtp_log_grid.faonni_smtp_log_grid.listing_top.bookmarks</item>
+                        <item name="namespace" xsi:type="string">current.search</item>
+                    </item>
+                </item>
+            </argument>
+        </filterSearch>
         <filters name="listing_filters">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
-                    <item name="templates" xsi:type="array">
-                        <item name="filters" xsi:type="array">
-                            <item name="select" xsi:type="array">
-                                <item name="component" xsi:type="string">Magento_Ui/js/form/element/ui-select</item>
-                                <item name="template" xsi:type="string">ui/grid/filters/elements/ui-select</item>
-                            </item>
+                    <item name="columnsProvider" xsi:type="string">faonni_smtp_log_grid.faonni_smtp_log_grid.faonni_smtp_log_columns</item>
+                    <item name="storageConfig" xsi:type="array">
+                        <item name="provider" xsi:type="string">faonni_smtp_log_grid.faonni_smtp_log_grid.listing_top.bookmarks</item>
+                        <item name="namespace" xsi:type="string">current.filters</item>
+                    </item>
+                    <item name="childDefaults" xsi:type="array">
+                        <item name="provider" xsi:type="string">faonni_smtp_log_grid.faonni_smtp_log_grid.listing_top.listing_filters</item>
+                        <item name="imports" xsi:type="array">
+                            <item name="visible" xsi:type="string">faonni_smtp_log_grid.faonni_smtp_log_grid.faonni_smtp_log_columns.${ $.index }:visible</item>
                         </item>
                     </item>
                 </item>
-                <item name="observers" xsi:type="array">
-                    <item name="column" xsi:type="string">column</item>
-                </item>
             </argument>
         </filters>
         <massaction name="listing_massaction">
-			<argument name="data" xsi:type="array">
-				<item name="config" xsi:type="array">
-					<item name="selectProvider" xsi:type="string">faonni_smtp_log_grid.faonni_smtp_log_grid.faonni_smtp_log_columns.ids</item>
-					<item name="component" xsi:type="string">Magento_Ui/js/grid/tree-massactions</item>
-					<item name="indexField" xsi:type="string">log_id</item>
-				</item>
-			</argument>			
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="selectProvider" xsi:type="string">faonni_smtp_log_grid.faonni_smtp_log_grid.faonni_smtp_log_columns.ids</item>
+                    <item name="component" xsi:type="string">Magento_Ui/js/grid/tree-massactions</item>
+                    <item name="indexField" xsi:type="string">log_id</item>
+                </item>
+            </argument>
             <action name="delete">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
@@ -75,10 +109,20 @@
                         </item>
                     </item>
                 </argument>
-            </action>           
-        </massaction>        
-        <paging name="listing_paging"/>
-    </listingToolbar>           
+            </action>
+        </massaction>
+        <paging name="listing_paging">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="storageConfig" xsi:type="array">
+                        <item name="provider" xsi:type="string">faonni_smtp_log_grid.faonni_smtp_log_grid.listing_top.bookmarks</item>
+                        <item name="namespace" xsi:type="string">current.paging</item>
+                    </item>
+                    <item name="selectProvider" xsi:type="string">faonni_smtp_log_grid.faonni_smtp_log_grid.faonni_smtp_log_columns.ids</item>
+                </item>
+            </argument>
+        </paging>
+    </container>	
 	<!-- columns -->
     <columns name="faonni_smtp_log_columns">		
         <selectionsColumn name="ids">