PivotGrid - fix duplicated hierarchy prefix in axis SET and drill-down MDX (T1283598)

Author: aleksei-semikozov

packages/devextreme/js/__internal/grids/pivot_grid/xmla_store/m_xmla_store.ts

@@ -233,7 +233,12 @@ class XmlaStore {
 
       if (i < path.length) {
         if (isLastDimensionInGroup) {
-          arg = `(${dataField}.${preparePathValue(path[i], dataField)})`;
+          const pathValue = path[i];
+          if (hierarchyName && isString(pathValue) && pathValue.startsWith(`${hierarchyName}.`)) {
+            arg = `(${pathValue})`;
+          } else {
+            arg = `(${dataField}.${preparePathValue(pathValue, dataField)})`;
+          }
         }
       } else if (i <= expandAllIndex) {
         if (i === 0 && expandAllCount === 0) {
@@ -585,7 +590,12 @@ class XmlaStore {
       if (field.hierarchyName && (fields[index + 1] || {}).hierarchyName === field.hierarchyName) {
         return;
       }
-      slice.push(`${field.dataField}.${this.preparePathValue(value, field.dataField)}`);
+      const { hierarchyName } = field;
+      if (hierarchyName && isString(value) && value.startsWith(`${hierarchyName}.`)) {
+        slice.push(value);
+      } else {
+        slice.push(`${field.dataField}.${this.preparePathValue(value, field.dataField)}`);
+      }
     });
   }
 

packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.tests.js

@@ -494,6 +494,66 @@ QUnit.module('Hierarchies', stubsEnvironment, () => {
         );
     });
 
+    QUnit.test('T1283598. Axis SET should not duplicate hierarchy prefix when expanded path value is a full unique name', function(assert) {
+        this.store.load({
+            columns: [{ dataField: '[Active Month].[Active Month]' }],
+            rows: [
+                { dataField: '[Product].[Product Purchaser Type].[Purchaser Type]', hierarchyName: '[Product].[Product Purchaser Type]' },
+                { dataField: '[Product].[Product Purchaser Type].[Purchaser Sub Type]', hierarchyName: '[Product].[Product Purchaser Type]' },
+                { dataField: '[Product].[Product Nbr]' }
+            ],
+            values: [{ dataField: '[Measures].[Members]', caption: 'Members' }],
+            rowExpandedPaths: [
+                ['[Product].[Product Purchaser Type].[Purchaser Type].&[Commercial]'],
+                ['[Product].[Product Purchaser Type].[Purchaser Type].&[Commercial]', '[Product].[Product Purchaser Type].[Purchaser Type].&[Commercial].&[Group]']
+            ]
+        });
+        const query = this.getQuery();
+
+        assert.notStrictEqual(
+            query.indexOf('([Product].[Product Purchaser Type].[Purchaser Type].&[Commercial].&[Group])'),
+            -1,
+            'axis SET contains the full unique name once'
+        );
+        assert.strictEqual(
+            query.indexOf('[Product].[Product Purchaser Type].[Purchaser Sub Type].[Product].[Product Purchaser Type]'),
+            -1,
+            'axis SET does not duplicate the hierarchy prefix'
+        );
+    });
+
+    QUnit.test('T1283598. Drill-down WHERE slice should not duplicate hierarchy prefix when path value is a full unique name', function(assert) {
+        this.store.getDrillDownItems({
+            columns: [{ dataField: '[Active Month].[Active Month]' }],
+            rows: [
+                { dataField: '[Product].[Product Purchaser Type].[Purchaser Type]', hierarchyName: '[Product].[Product Purchaser Type]' },
+                { dataField: '[Product].[Product Purchaser Type].[Purchaser Sub Type]', hierarchyName: '[Product].[Product Purchaser Type]' },
+                { dataField: '[Product].[Product Nbr]' }
+            ],
+            values: [{ dataField: '[Measures].[Members]', caption: 'Members' }]
+        }, {
+            columnPath: [],
+            rowPath: [
+                '[Product].[Product Purchaser Type].[Purchaser Type].&[Commercial]',
+                '[Product].[Product Purchaser Type].[Purchaser Type].&[Commercial].&[Group]'
+            ],
+            dataIndex: 0,
+            maxRowCount: 100
+        });
+        const query = this.getQuery();
+
+        assert.notStrictEqual(
+            query.indexOf('WHERE ([Product].[Product Purchaser Type].[Purchaser Type].&[Commercial].&[Group])'),
+            -1,
+            'drill-down WHERE slice contains the full unique name once'
+        );
+        assert.strictEqual(
+            query.indexOf('[Product].[Product Purchaser Type].[Purchaser Sub Type].[Product].[Product Purchaser Type]'),
+            -1,
+            'drill-down WHERE slice does not duplicate the hierarchy prefix'
+        );
+    });
+
     QUnit.test('Hierarchy. Expand child when opposite axis expanded on several levels', function(assert) {
         this.store.load({
             columns: [{