Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3149' into Tier4-Kings-PR-08-23-2024

Author: devarul

dev/tests/js/jasmine/tests/lib/mage/adminhtml/grid.test.js

@@ -0,0 +1,41 @@
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * ************************************************************************
+ */
+define(['mage/adminhtml/grid'], function () {
+    'use strict';
+    describe('mage/adminhtml/grid', function () {
+        let gridInstance,originalVarienGridInitializeFn;
+
+        beforeEach(function () {
+            // Create an instance of varienGrid
+            originalVarienGridInitializeFn = window.varienGrid.prototype.initialize;
+            window.varienGrid.prototype.initialize = jasmine.createSpy('initialize');
+            gridInstance = new window.varienGrid();
+
+            spyOn(gridInstance, 'reload');
+            // eslint-disable-next-line max-nested-callbacks
+            spyOn(gridInstance, 'addVarToUrl').and.callFake(function (filterVar, value) {
+                return `https://test.com/${filterVar}/${value}/`;
+            });
+            gridInstance.filterVar = 'filter';
+        });
+
+        afterEach(function () {
+            window.varienGrid.prototype.initialize = originalVarienGridInitializeFn;
+        });
+
+        it('should reset the filter, clean the URL, and reload with the correct URL', function () {
+            let callback = jasmine.createSpy('callback'),
+                expectedUrl = 'https://test.com/filter/';
+
+            gridInstance.resetFilter(callback);
+            expect(gridInstance.addVarToUrl).toHaveBeenCalledWith('filter', '');
+            expect(gridInstance.reload).toHaveBeenCalledWith(expectedUrl, callback);
+            expect(gridInstance.reload.calls.count()).toBe(1);
+        });
+    });
+});

lib/web/mage/adminhtml/grid.js

@@ -366,6 +366,7 @@ define([
          * @private
          */
         _addVarToUrl: function (url, varName, varValue) {
+            /* eslint-disable-next-line */
             var re = new RegExp('\/(' + varName + '\/.*?\/)'),
                 parts = url.split(new RegExp('\\?'));
 
@@ -388,6 +389,7 @@ define([
          * @private
          */
         _buildFormAndSubmit: function (url, varName, varValue) {
+            /* eslint-disable-next-line */
             var re = new RegExp('\/(' + varName + '\/.*?\/)'),
                 parts = url.split(new RegExp('\\?')),
                 form = jQuery('<form></form>'),
@@ -461,8 +463,8 @@ define([
          */
         bindFilterFields: function () {
             var filters = $$(
-                '#' + this.containerId + ' [data-role="filter-form"] input',
-                '#' + this.containerId + ' [data-role="filter-form"] select'
+                    '#' + this.containerId + ' [data-role="filter-form"] input',
+                    '#' + this.containerId + ' [data-role="filter-form"] select'
                 ),
                 i;
 
@@ -535,8 +537,8 @@ define([
          */
         doFilter: function (callback) {
             var filters = $$(
-                '#' + this.containerId + ' [data-role="filter-form"] input',
-                '#' + this.containerId + ' [data-role="filter-form"] select'
+                    '#' + this.containerId + ' [data-role="filter-form"] input',
+                    '#' + this.containerId + ' [data-role="filter-form"] select'
                 ),
                 elements = [],
                 i;
@@ -559,7 +561,10 @@ define([
          * @param {Function} callback
          */
         resetFilter: function (callback) {
-            this.reload(this.addVarToUrl(this.filterVar, ''), callback);
+            let resetUrl = this.addVarToUrl(this.filterVar, '');
+
+            resetUrl = resetUrl.replace(/([^:]\/)\/+/g, '$1');
+            this.reload(resetUrl, callback);
         },
 
         /**
@@ -1053,7 +1058,7 @@ define([
          */
         updateCount: function () {
             var checkboxesTotal = varienStringArray.count(
-                this.useSelectAll ? this.getGridIds() : this.getCheckboxesValuesAsString()
+                    this.useSelectAll ? this.getGridIds() : this.getCheckboxesValuesAsString()
                 ),
                 checkboxesChecked = varienStringArray.count(this.checkedString);