@gravity-ui/dashkit 6.7.1 → 6.7.2

package/build/cjs/shared/modules/helpers.js

@@ -78,19 +78,10 @@ function formQueueData({ items, itemsStateAndParams, }) {
         }
         const itemQueueParams = (0, get_1.default)(itemsStateAndParams, [item.id, 'params'], {});
         const filteredParamsByDefaults = (0, pick_1.default)(itemQueueParams, Object.keys(itemDefaultParams));
-        /**
-         * filtering actionParams without prefixes by defaults params
-         * ex.:
-         * itemDefaultParams contains 'Country' in defaults
-         * and we receive '_ap_Country' and '_ap_City' in itemQueueParams
-         * we need to ignore '_ap_City' param because we don't have actionParam without prefix ('City') in defaults
-         */
-        const actionParams = pickActionParamsFromParams(itemQueueParams, false) || {};
-        const filteredActionParamsByDefaults = (0, pick_1.default)(actionParams, Object.keys(itemDefaultParams));
         /**
          * merging filtered params and filtered actionParams with prefixes
          */
-        const params = Object.assign(Object.assign({}, filteredParamsByDefaults), transformParamsToActionParams(filteredActionParamsByDefaults));
+        const params = Object.assign(Object.assign({}, filteredParamsByDefaults), (pickActionParamsFromParams(itemQueueParams, true) || {}));
         return {
             id: item.id,
             namespace: item.namespace,

package/build/cjs/shared/units/__tests__/state-and-params.test.js

@@ -574,3 +574,150 @@ describe('getItemsStateAndParams actionParams variants check', () => {
         });
     });
 });
+const config = {
+    id: '7kw',
+    items: [
+        {
+            id: 'nvp',
+            data: {
+                tabs: [
+                    {
+                        id: 'rkq',
+                        title: 'test',
+                        params: {},
+                        chartId: 'some-chart',
+                        isDefault: true,
+                        autoHeight: false,
+                        description: '',
+                        enableActionParams: true,
+                    },
+                ],
+                hideTitle: true,
+            },
+            type: 'widget',
+            layout: {
+                h: 12,
+                w: 12,
+            },
+            namespace: 'default',
+        },
+        {
+            id: 'Q9K',
+            data: {
+                title: 'Year',
+                source: {},
+            },
+            type: 'control',
+            layout: {
+                h: 2,
+                w: 8,
+            },
+            defaults: {
+                year_some_id: '',
+            },
+            namespace: 'default',
+        },
+    ],
+    title: 'test',
+    layout: [
+        {
+            h: 12,
+            i: 'nvp',
+            w: 12,
+            x: 0,
+            y: 0,
+        },
+        {
+            h: 2,
+            i: 'Q9K',
+            w: 8,
+            x: 12,
+            y: 0,
+        },
+    ],
+    aliases: {},
+    connections: [],
+    salt: '123',
+    counter: 1,
+};
+const itemsStateAndParamsActionParamTest1 = {
+    nvp: {
+        params: {
+            _ap_year_some_id: ['2022'],
+        },
+    },
+    __meta__: {
+        queue: [
+            {
+                id: 'nvp',
+                tabId: 'rkq',
+            },
+        ],
+        version: 2,
+    },
+};
+const stateAndParamsActionParamsRes1 = {
+    Q9K: {
+        params: {
+            year_some_id: ['2022'],
+        },
+        state: {},
+    },
+    nvp: {
+        params: {
+            _ap_year_some_id: ['2022'],
+            year_some_id: '',
+        },
+        state: {},
+    },
+};
+const itemsStateAndParamsActionParamTest2 = {
+    nvp: {
+        params: {
+            _ap_another: ['2022'],
+        },
+    },
+    __meta__: {
+        queue: [
+            {
+                id: 'nvp',
+                tabId: 'rkq',
+            },
+        ],
+        version: 2,
+    },
+};
+const stateAndParamsActionParamsRes2 = {
+    Q9K: {
+        params: {
+            another: ['2022'],
+            year_some_id: '',
+        },
+        state: {},
+    },
+    nvp: {
+        params: {
+            _ap_another: ['2022'],
+            year_some_id: '',
+        },
+        state: {},
+    },
+};
+describe('state and params with actionParams', () => {
+    it('check state', () => {
+        const res1 = (0, datalens_1.getItemsStateAndParamsDL)({
+            defaultGlobalParams: {},
+            globalParams: {},
+            config,
+            itemsStateAndParams: itemsStateAndParamsActionParamTest1,
+        });
+        expect(res1).toEqual(stateAndParamsActionParamsRes1);
+        const res2 = (0, datalens_1.getItemsStateAndParamsDL)({
+            defaultGlobalParams: {},
+            globalParams: {},
+            config,
+            itemsStateAndParams: itemsStateAndParamsActionParamTest2,
+        });
+        expect(res2).toEqual(stateAndParamsActionParamsRes2);
+    });
+});

package/build/esm/shared/modules/helpers.js

@@ -70,19 +70,10 @@ export function formQueueData({ items, itemsStateAndParams, }) {
         }
         const itemQueueParams = get(itemsStateAndParams, [item.id, 'params'], {});
         const filteredParamsByDefaults = pick(itemQueueParams, Object.keys(itemDefaultParams));
-        /**
-         * filtering actionParams without prefixes by defaults params
-         * ex.:
-         * itemDefaultParams contains 'Country' in defaults
-         * and we receive '_ap_Country' and '_ap_City' in itemQueueParams
-         * we need to ignore '_ap_City' param because we don't have actionParam without prefix ('City') in defaults
-         */
-        const actionParams = pickActionParamsFromParams(itemQueueParams, false) || {};
-        const filteredActionParamsByDefaults = pick(actionParams, Object.keys(itemDefaultParams));
         /**
          * merging filtered params and filtered actionParams with prefixes
          */
-        const params = Object.assign(Object.assign({}, filteredParamsByDefaults), transformParamsToActionParams(filteredActionParamsByDefaults));
+        const params = Object.assign(Object.assign({}, filteredParamsByDefaults), (pickActionParamsFromParams(itemQueueParams, true) || {}));
         return {
             id: item.id,
             namespace: item.namespace,

package/build/esm/shared/units/__tests__/state-and-params.test.js

@@ -570,3 +570,150 @@ describe('getItemsStateAndParams actionParams variants check', () => {
         });
     });
 });
+const config = {
+    id: '7kw',
+    items: [
+        {
+            id: 'nvp',
+            data: {
+                tabs: [
+                    {
+                        id: 'rkq',
+                        title: 'test',
+                        params: {},
+                        chartId: 'some-chart',
+                        isDefault: true,
+                        autoHeight: false,
+                        description: '',
+                        enableActionParams: true,
+                    },
+                ],
+                hideTitle: true,
+            },
+            type: 'widget',
+            layout: {
+                h: 12,
+                w: 12,
+            },
+            namespace: 'default',
+        },
+        {
+            id: 'Q9K',
+            data: {
+                title: 'Year',
+                source: {},
+            },
+            type: 'control',
+            layout: {
+                h: 2,
+                w: 8,
+            },
+            defaults: {
+                year_some_id: '',
+            },
+            namespace: 'default',
+        },
+    ],
+    title: 'test',
+    layout: [
+        {
+            h: 12,
+            i: 'nvp',
+            w: 12,
+            x: 0,
+            y: 0,
+        },
+        {
+            h: 2,
+            i: 'Q9K',
+            w: 8,
+            x: 12,
+            y: 0,
+        },
+    ],
+    aliases: {},
+    connections: [],
+    salt: '123',
+    counter: 1,
+};
+const itemsStateAndParamsActionParamTest1 = {
+    nvp: {
+        params: {
+            _ap_year_some_id: ['2022'],
+        },
+    },
+    __meta__: {
+        queue: [
+            {
+                id: 'nvp',
+                tabId: 'rkq',
+            },
+        ],
+        version: 2,
+    },
+};
+const stateAndParamsActionParamsRes1 = {
+    Q9K: {
+        params: {
+            year_some_id: ['2022'],
+        },
+        state: {},
+    },
+    nvp: {
+        params: {
+            _ap_year_some_id: ['2022'],
+            year_some_id: '',
+        },
+        state: {},
+    },
+};
+const itemsStateAndParamsActionParamTest2 = {
+    nvp: {
+        params: {
+            _ap_another: ['2022'],
+        },
+    },
+    __meta__: {
+        queue: [
+            {
+                id: 'nvp',
+                tabId: 'rkq',
+            },
+        ],
+        version: 2,
+    },
+};
+const stateAndParamsActionParamsRes2 = {
+    Q9K: {
+        params: {
+            another: ['2022'],
+            year_some_id: '',
+        },
+        state: {},
+    },
+    nvp: {
+        params: {
+            _ap_another: ['2022'],
+            year_some_id: '',
+        },
+        state: {},
+    },
+};
+describe('state and params with actionParams', () => {
+    it('check state', () => {
+        const res1 = getItemsStateAndParamsDL({
+            defaultGlobalParams: {},
+            globalParams: {},
+            config,
+            itemsStateAndParams: itemsStateAndParamsActionParamTest1,
+        });
+        expect(res1).toEqual(stateAndParamsActionParamsRes1);
+        const res2 = getItemsStateAndParamsDL({
+            defaultGlobalParams: {},
+            globalParams: {},
+            config,
+            itemsStateAndParams: itemsStateAndParamsActionParamTest2,
+        });
+        expect(res2).toEqual(stateAndParamsActionParamsRes2);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/dashkit",
-  "version": "6.7.1",
+  "version": "6.7.2",
   "description": "Library for rendering dashboard grid layout",
   "license": "MIT",
   "repository": {