[Improvement]: Cancel batch export (#14173)

* Cancel batch export in object grid Similar to #13839 * fix export progress window width * fix new line end of file
pimcore · Feb 2, 2023 · 3a03e14 · 3a03e14
1 parent eb4ece7
commit 3a03e14
Showing 1 changed file with 26 additions and 4 deletions.
diff --git a/bundles/AdminBundle/public/js/pimcore/element/helpers/gridColumnConfig.js b/bundles/AdminBundle/public/js/pimcore/element/helpers/gridColumnConfig.js
@@ -774,15 +774,37 @@ pimcore.element.helpers.gridColumnConfig = {
             };
             this.exportProgressBar = new Ext.ProgressBar({
                 text: t('initializing'),
-                style: "margin: 10px;",
+                style: "margin-top: 0px;",
                 width: 500
             });
+
+            this.cancelBtn = Ext.create('Ext.Button', {
+                scale: 'small',
+                text: t('cancel'),
+                tooltip: t('cancel'),
+                icon: '/bundles/pimcoreadmin/img/flat-color-icons/cancel.svg',
+                style: 'margin-left:5px;height:30px',
+                handler: () => {
+                    // Stop the batch processing
+                    this.exportJobCurrent = Infinity;
+                }
+            });
+
+            this.progressPanel = Ext.create('Ext.panel.Panel', {
+                layout: {
+                    type: 'hbox',
+                },
+                items: [
+                    this.exportProgressBar,
+                    this.cancelBtn
+                ],
+            });
 
             this.exportProgressWin = new Ext.Window({
                 title: t("export"),
-                items: [this.exportProgressBar],
+                items: [this.progressPanel],
                 layout: 'fit',
-                width: 200,
+                width: 650,
                 bodyStyle: "padding: 10px;",
                 closable: false,
                 plain: true,
@@ -915,4 +937,4 @@ pimcore.element.helpers.gridColumnConfig = {
         return params;
 
     }
-};
+};