@gravity-ui/dashkit 5.2.0 → 5.4.0

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

@@ -257,6 +257,155 @@ export const stateAndParams3 = {
         },
     },
 };
+const stateAndParamsForAP1 = {
+    in: {
+        Q8: { params: { _ap_Country: 'Italy' } },
+        __meta__: { queue: [{ id: 'Q8', tabId: 'K0' }], version: 2 },
+    },
+    out: {
+        L5: {
+            params: { Country: 'Italy', 'd079937f-6bc4-4133-9171-40092bb20d6f': 'Italy' },
+            state: {},
+        },
+        Q8: {
+            params: {
+                Country: '',
+                Year: '',
+                _ap_Country: 'Italy',
+                'd079937f-6bc4-4133-9171-40092bb20d6f': '',
+            },
+            state: {},
+        },
+        al: {
+            params: { Country: 'Italy', 'd079937f-6bc4-4133-9171-40092bb20d6f': 'Italy' },
+            state: {},
+        },
+    },
+};
+const stateAndParamsForAP2 = {
+    in: {
+        L5: {
+            params: { 'd079937f-6bc4-4133-9171-40092bb20d6f': 'Belgium' },
+        },
+        Q8: {
+            params: { _ap_Country: 'Italy' },
+        },
+        __meta__: { queue: [{ id: 'Q8', tabId: 'K0' }, { id: 'L5' }], version: 2 },
+    },
+    out: {
+        L5: {
+            params: { Country: 'Belgium', 'd079937f-6bc4-4133-9171-40092bb20d6f': 'Belgium' },
+            state: {},
+        },
+        Q8: {
+            params: {
+                Country: 'Belgium',
+                Year: '',
+                'd079937f-6bc4-4133-9171-40092bb20d6f': 'Belgium',
+            },
+            state: {},
+        },
+        al: {
+            params: { Country: 'Belgium', 'd079937f-6bc4-4133-9171-40092bb20d6f': 'Belgium' },
+            state: {},
+        },
+    },
+};
+const stateAndParamsForAP3 = {
+    in: {
+        Q8: { params: { _ap_Country: 'Italy' } },
+        L5: { params: { 'd079937f-6bc4-4133-9171-40092bb20d6f': '' } },
+        __meta__: { queue: [{ id: 'Q8', tabId: 'K0' }, { id: 'L5' }], version: 2 },
+    },
+    out: {
+        L5: {
+            params: {
+                Country: '',
+                'd079937f-6bc4-4133-9171-40092bb20d6f': '',
+            },
+            state: {},
+        },
+        Q8: {
+            params: {
+                Country: '',
+                Year: '',
+                'd079937f-6bc4-4133-9171-40092bb20d6f': '',
+            },
+            state: {},
+        },
+        al: {
+            params: {
+                Country: '',
+                'd079937f-6bc4-4133-9171-40092bb20d6f': '',
+            },
+            state: {},
+        },
+    },
+};
+const stateAndParamsForAP4 = {
+    in: {
+        Q8: { params: { _ap_Country: '' } },
+        L5: { params: { 'd079937f-6bc4-4133-9171-40092bb20d6f': '' } },
+        __meta__: { queue: [{ id: 'L5' }, { id: 'Q8', tabId: 'K0' }], version: 2 },
+    },
+    out: {
+        L5: {
+            params: {
+                Country: '',
+                'd079937f-6bc4-4133-9171-40092bb20d6f': '',
+            },
+            state: {},
+        },
+        Q8: {
+            params: {
+                Country: '',
+                Year: '',
+                _ap_Country: '',
+                'd079937f-6bc4-4133-9171-40092bb20d6f': '',
+            },
+            state: {},
+        },
+        al: {
+            params: {
+                Country: '',
+                'd079937f-6bc4-4133-9171-40092bb20d6f': '',
+            },
+            state: {},
+        },
+    },
+};
+const stateAndParamsForAP5 = {
+    in: {
+        Q8: { params: {} },
+        L5: { params: {} },
+        __meta__: { queue: [], version: 2 },
+    },
+    out: {
+        L5: {
+            params: {
+                Country: ['Italy', 'France'],
+                'd079937f-6bc4-4133-9171-40092bb20d6f': ['Italy', 'France'],
+            },
+            state: {},
+        },
+        Q8: {
+            params: {
+                Country: ['Italy', 'France'],
+                Year: '',
+                _ap_Country: 'Belgium',
+                'd079937f-6bc4-4133-9171-40092bb20d6f': ['Italy', 'France'],
+            },
+            state: {},
+        },
+        al: {
+            params: {
+                Country: ['Italy', 'France'],
+                'd079937f-6bc4-4133-9171-40092bb20d6f': ['Italy', 'France'],
+            },
+            state: {},
+        },
+    },
+};
 const configs = mockConfigs.configs;
 describe('getItemsStateAndParamsDL', () => {
     describe('old version fallback', () => {
@@ -293,3 +442,60 @@ describe('getItemsStateAndParamsDL', () => {
         });
     });
 });
+describe('getItemsStateAndParams actionParams variants check', () => {
+    describe('action and params state 1', () => {
+        const resultItemsStateAndParams = getItemsStateAndParamsDL({
+            defaultGlobalParams: {},
+            globalParams: {},
+            config: configs[2],
+            itemsStateAndParams: stateAndParamsForAP1.in,
+        });
+        it('return stateAndParamsForAP1.out', () => {
+            expect(resultItemsStateAndParams).toEqual(omit(stateAndParamsForAP1.out, META_KEY));
+        });
+    });
+    describe('action and params state 2', () => {
+        const resultItemsStateAndParams = getItemsStateAndParamsDL({
+            defaultGlobalParams: {},
+            globalParams: {},
+            config: configs[2],
+            itemsStateAndParams: stateAndParamsForAP2.in,
+        });
+        it('return stateAndParamsForAP2.out', () => {
+            expect(resultItemsStateAndParams).toEqual(omit(stateAndParamsForAP2.out, META_KEY));
+        });
+    });
+    describe('action and params state 3', () => {
+        const resultItemsStateAndParams = getItemsStateAndParamsDL({
+            defaultGlobalParams: {},
+            globalParams: {},
+            config: configs[2],
+            itemsStateAndParams: stateAndParamsForAP3.in,
+        });
+        it('return stateAndParamsForAP3.out', () => {
+            expect(resultItemsStateAndParams).toEqual(omit(stateAndParamsForAP3.out, META_KEY));
+        });
+    });
+    describe('action and params state 4', () => {
+        const resultItemsStateAndParams = getItemsStateAndParamsDL({
+            defaultGlobalParams: {},
+            globalParams: {},
+            config: configs[2],
+            itemsStateAndParams: stateAndParamsForAP4.in,
+        });
+        it('return stateAndParamsForAP4.out', () => {
+            expect(resultItemsStateAndParams).toEqual(omit(stateAndParamsForAP4.out, META_KEY));
+        });
+    });
+    describe('action and params state 5', () => {
+        const resultItemsStateAndParams = getItemsStateAndParamsDL({
+            defaultGlobalParams: {},
+            globalParams: {},
+            config: configs[3],
+            itemsStateAndParams: stateAndParamsForAP5.in,
+        });
+        it('return stateAndParamsForAP5.out', () => {
+            expect(resultItemsStateAndParams).toEqual(omit(stateAndParamsForAP5.out, META_KEY));
+        });
+    });
+});

package/build/esm/utils/update-manager.js

@@ -1,7 +1,7 @@
 import update, { extend } from 'immutability-helper';
 import omit from 'lodash/omit';
 import pick from 'lodash/pick';
-import { mergeParamsWithAliases, isItemWithTabs, getCurrentVersion, META_KEY, deleteFromQueue, addToQueue, getInitialItemsStateAndParamsMeta, resolveItemInnerId, getItemsStateAndParamsMeta, } from '../shared';
+import { mergeParamsWithAliases, isItemWithTabs, getCurrentVersion, META_KEY, deleteFromQueue, addToQueue, getInitialItemsStateAndParamsMeta, resolveItemInnerId, getItemsStateAndParamsMeta, pickActionParamsFromParams, transformParamsToActionParams, } from '../shared';
 import { DEFAULT_NAMESPACE } from '../constants';
 import { getNewId } from './get-new-id';
 extend('$auto', (value, object) => (object ? update(object, value) : update({}, value)));
@@ -60,9 +60,14 @@ function removeItemVersion1({ id, config, itemsStateAndParams }) {
         itemsStateAndParams: newItemsStateAndParams,
     };
 }
-function getAllowableChangedParams(item, stateAndParams, itemsStateAndParams) {
+function getAllowableChangedParams(item, stateAndParams, itemsStateAndParams, paramsSettings) {
     var _a;
+    const paramsTypeName = (paramsSettings === null || paramsSettings === void 0 ? void 0 : paramsSettings.type) || 'params';
+    const isActionParamsMode = paramsTypeName === 'actionParams';
     let allowedParams = {};
+    const stateParamsConf = isActionParamsMode
+        ? pickActionParamsFromParams(stateAndParams.params, false)
+        : stateAndParams.params;
     if (isItemWithTabs(item)) {
         let tab;
         if ('state' in stateAndParams && ((_a = stateAndParams.state) === null || _a === void 0 ? void 0 : _a.tabId)) {
@@ -72,14 +77,19 @@ function getAllowableChangedParams(item, stateAndParams, itemsStateAndParams) {
             const tabId = resolveItemInnerId({ item, itemsStateAndParams });
             tab = item.data.tabs.find(({ id }) => id === tabId);
         }
-        allowedParams = pick(stateAndParams.params, Object.keys((tab === null || tab === void 0 ? void 0 : tab.params) || {}));
+        allowedParams = pick(stateParamsConf, Object.keys((tab === null || tab === void 0 ? void 0 : tab.params) || {}));
     }
     else {
-        allowedParams = pick(stateAndParams.params, Object.keys(item.defaults || {}));
+        allowedParams = pick(stateParamsConf, Object.keys(item.defaults || {}));
     }
-    if (Object.keys(allowedParams).length !== Object.keys(stateAndParams.params || {}).length) {
+    if (Object.keys(allowedParams || {}).length !== Object.keys(stateParamsConf || {}).length) {
         console.warn('Параметры, которых нет в defaults, будут проигнорированы!');
     }
+    if (isActionParamsMode) {
+        return (paramsSettings === null || paramsSettings === void 0 ? void 0 : paramsSettings.returnPrefix)
+            ? transformParamsToActionParams(allowedParams)
+            : allowedParams;
+    }
     return allowedParams;
 }
 function changeStateAndParamsVersion1({ id: initiatorId, config, stateAndParams, itemsStateAndParams, }) {
@@ -240,6 +250,7 @@ export class UpdateManager {
         const currentMeta = getItemsStateAndParamsMeta(itemsStateAndParams);
         if ('params' in stateAndParams) {
             const allowableParams = getAllowableChangedParams(initiatorItem, stateAndParams, itemsStateAndParams);
+            const allowableActionParams = getAllowableChangedParams(initiatorItem, stateAndParams, itemsStateAndParams, { type: 'actionParams', returnPrefix: true });
             const tabId = isItemWithTabs(initiatorItem)
                 ? newTabId || resolveItemInnerId({ item: initiatorItem, itemsStateAndParams })
                 : undefined;
@@ -250,15 +261,16 @@ export class UpdateManager {
             if (isTabSwitched) {
                 commandUpdateParams = '$set';
             }
-            return update(itemsStateAndParams, {
+            const obj = {
                 $unset: unusedIds,
                 [initiatorId]: {
                     $auto: Object.assign({ params: {
-                            [commandUpdateParams]: allowableParams,
+                            [commandUpdateParams]: Object.assign(Object.assign({}, allowableParams), allowableActionParams),
                         } }, (hasState ? { state: { $set: stateAndParams.state } } : {})),
                 },
                 [META_KEY]: { $set: meta },
-            });
+            };
+            return update(itemsStateAndParams, obj);
         }
         else if (hasState) {
             let metaSpec = {};

package/package.json

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