@gravity-ui/dashkit 6.6.1-beta-v.shangin.0 → 6.6.1-beta-v.marginy.0

package/build/cjs/shared/modules/helpers.d.ts

@@ -69,4 +69,13 @@ export declare function hasActionParam(conf?: StringParams): boolean;
  * @param stateAndParams
  */
 export declare function hasActionParams(stateAndParams: ItemStateAndParams): boolean;
+/**
+ * Collect array of actionParams keys with prefix (_ap_) that must be cleared from widget defaults
+ * @param defaultWidgetParams
+ * @param queueWidgetParams
+ */
+export declare function getDefaultsActionParamsToClear({ defaultWidgetParams, queueWidgetParams, }: {
+    defaultWidgetParams: StringParams;
+    queueWidgetParams: StringParams;
+}): string[];
 export {};

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

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasActionParams = exports.hasActionParam = exports.transformParamsToActionParams = exports.pickExceptActionParamsFromParams = exports.pickActionParamsFromParams = exports.deleteFromQueue = exports.addToQueue = exports.getInitialItemsStateAndParamsMeta = exports.mergeParamsWithAliases = exports.getMapItemsIgnores = exports.resolveItemInnerId = exports.formQueueData = exports.isItemWithTabs = exports.getCurrentVersion = exports.getItemsStateAndParamsMeta = exports.prerenderItems = void 0;
+exports.getDefaultsActionParamsToClear = exports.hasActionParams = exports.hasActionParam = exports.transformParamsToActionParams = exports.pickExceptActionParamsFromParams = exports.pickActionParamsFromParams = exports.deleteFromQueue = exports.addToQueue = exports.getInitialItemsStateAndParamsMeta = exports.mergeParamsWithAliases = exports.getMapItemsIgnores = exports.resolveItemInnerId = exports.formQueueData = exports.isItemWithTabs = exports.getCurrentVersion = exports.getItemsStateAndParamsMeta = exports.prerenderItems = void 0;
 const tslib_1 = require("tslib");
 const keyBy_1 = tslib_1.__importDefault(require("lodash/keyBy"));
 const get_1 = tslib_1.__importDefault(require("lodash/get"));
 const invert_1 = tslib_1.__importDefault(require("lodash/invert"));
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const pick_1 = tslib_1.__importDefault(require("lodash/pick"));
+const intersection_1 = tslib_1.__importDefault(require("lodash/intersection"));
 const constants_1 = require("../constants");
 function getNormalizedPlugins(plugins) {
     return (0, keyBy_1.default)(plugins, 'type');
@@ -259,3 +260,23 @@ function hasActionParams(stateAndParams) {
     return hasActionParam(stateAndParams.params);
 }
 exports.hasActionParams = hasActionParams;
+/**
+ * Collect array of actionParams keys with prefix (_ap_) that must be cleared from widget defaults
+ * @param defaultWidgetParams
+ * @param queueWidgetParams
+ */
+function getDefaultsActionParamsToClear({ defaultWidgetParams, queueWidgetParams, }) {
+    const widgetDefaultsWithActionParams = hasActionParam(defaultWidgetParams)
+        ? pickActionParamsFromParams(defaultWidgetParams)
+        : null;
+    if (!widgetDefaultsWithActionParams) {
+        return [];
+    }
+    // clear default actionParams if some param with the same name without prefix affected on current widget
+    // ex.: queueWidgetParams contain {Year: 1970} and default actionParams contain {_ap_Year: 2000}
+    const actionParamKeyToClear = (0, intersection_1.default)(Object.keys(queueWidgetParams), Object.keys(widgetDefaultsWithActionParams));
+    return actionParamKeyToClear.length
+        ? actionParamKeyToClear.map((key) => `${constants_1.ACTION_PARAM_PREFIX}${key}`)
+        : [];
+}
+exports.getDefaultsActionParamsToClear = getDefaultsActionParamsToClear;

package/build/cjs/shared/modules/state-and-params.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getItemsStateAndParams = exports.getItemsState = exports.getItemsParams = void 0;
 const tslib_1 = require("tslib");
 const groupBy_1 = tslib_1.__importDefault(require("lodash/groupBy"));
+const intersection_1 = tslib_1.__importDefault(require("lodash/intersection"));
+const omit_1 = tslib_1.__importDefault(require("lodash/omit"));
 const constants_1 = require("../constants");
 const helpers_1 = require("./helpers");
 function getItemsParams({ defaultGlobalParams = {}, globalParams = {}, config, itemsStateAndParams, plugins, }) {
@@ -52,7 +54,8 @@ function getItemsParams({ defaultGlobalParams = {}, globalParams = {}, config, i
         }
         else {
             // params according to queue of its applying
-            let queueDataItemsParams = {};
+            let prevQueueDataWithActionParams = {};
+            let queueDataItems = {};
             for (const data of Object.values(queueData)) {
                 if (data.namespace !== namespace || itemIgnores.includes(data.id)) {
                     continue;
@@ -65,9 +68,24 @@ function getItemsParams({ defaultGlobalParams = {}, globalParams = {}, config, i
                     params = (0, helpers_1.pickExceptActionParamsFromParams)(data.params);
                 }
                 const mergedParams = getMergedParams(params, actionParams);
-                queueDataItemsParams = Object.assign(Object.assign({}, queueDataItemsParams), mergedParams);
+                const actionParamKeyToClear = (0, intersection_1.default)(Object.keys((0, helpers_1.transformParamsToActionParams)(mergedParams)), Object.keys(prevQueueDataWithActionParams));
+                let queueDataRes = Object.assign({}, queueDataItems);
+                if (actionParamKeyToClear.length) {
+                    queueDataRes = (0, omit_1.default)(queueDataItems, actionParamKeyToClear);
+                }
+                queueDataItems = Object.assign(Object.assign({}, queueDataRes), mergedParams);
+                prevQueueDataWithActionParams = (0, helpers_1.hasActionParam)(queueDataItems)
+                    ? (0, helpers_1.pickActionParamsFromParams)(data.params, true)
+                    : {};
+            }
+            const clearActionParams = (0, helpers_1.getDefaultsActionParamsToClear)({
+                defaultWidgetParams,
+                queueWidgetParams: queueDataItems,
+            });
+            if (clearActionParams.length) {
+                defaultWidgetParams = (0, omit_1.default)(defaultWidgetParams, clearActionParams);
             }
-            itemParams = Object.assign(itemParams, queueDataItemsParams);
+            itemParams = Object.assign(itemParams, queueDataItems);
         }
         return Object.assign(Object.assign({}, itemsParams), { [id]: Object.assign(Object.assign({}, defaultWidgetParams), itemParams) });
     }, {});

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

@@ -306,7 +306,6 @@ const stateAndParamsForAP2 = {
                 Country: 'Belgium',
                 Year: '',
                 'd079937f-6bc4-4133-9171-40092bb20d6f': 'Belgium',
-                _ap_Country: 'Italy',
             },
             state: {},
         },
@@ -335,7 +334,6 @@ const stateAndParamsForAP3 = {
                 Country: '',
                 Year: '',
                 'd079937f-6bc4-4133-9171-40092bb20d6f': '',
-                _ap_Country: 'Italy',
             },
             state: {},
         },
@@ -412,64 +410,6 @@ const stateAndParamsForAP5 = {
         },
     },
 };
-const stateAndParamsForAP6 = {
-    in: {
-        Q8: {
-            params: {
-                _ap_Year: '2021',
-                _ap_Country: 'Russia',
-            },
-        },
-        L5: {
-            params: {
-                _ap_Country: 'Russia',
-                _ap_Name: 'Alex',
-                _ap_Price: '1000',
-            },
-        },
-        __meta__: {
-            queue: [
-                { id: 'Q8', tabId: 'K0' },
-                { id: 'L5', tabId: 'K1' },
-            ],
-            version: 2,
-        },
-    },
-    out: {
-        L5: {
-            params: {
-                Name: '',
-                Price: '',
-                Year: '2021',
-                Country: 'Russia',
-                _ap_Country: 'Russia',
-                _ap_Name: 'Alex',
-                _ap_Price: '1000',
-            },
-            state: {},
-        },
-        Q8: {
-            params: {
-                Year: '',
-                Country: 'Russia',
-                Name: 'Alex',
-                Price: '1000',
-                _ap_Year: '2021',
-                _ap_Country: 'Russia',
-            },
-            state: {},
-        },
-        al: {
-            params: {
-                Country: 'Russia',
-                Name: 'Alex',
-                Price: '1000',
-                Year: '2021',
-            },
-            state: {},
-        },
-    },
-};
 const configs = configs_json_1.default.configs;
 describe('getItemsStateAndParamsDL', () => {
     describe('old version fallback', () => {
@@ -562,15 +502,4 @@ describe('getItemsStateAndParams actionParams variants check', () => {
             expect(resultItemsStateAndParams).toEqual((0, omit_1.default)(stateAndParamsForAP5.out, constants_1.META_KEY));
         });
     });
-    describe('action and params state 6', () => {
-        const resultItemsStateAndParams = (0, datalens_1.getItemsStateAndParamsDL)({
-            defaultGlobalParams: {},
-            globalParams: {},
-            config: configs[4],
-            itemsStateAndParams: stateAndParamsForAP6.in,
-        });
-        it('return stateAndParamsForAP6.out', () => {
-            expect(resultItemsStateAndParams).toEqual((0, omit_1.default)(stateAndParamsForAP6.out, constants_1.META_KEY));
-        });
-    });
 });

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

@@ -262,7 +262,12 @@ class UpdateManager {
             let commandUpdateParams = ((_b = itemsStateAndParams[initiatorId]) === null || _b === void 0 ? void 0 : _b.params)
                 ? '$merge'
                 : '$set';
-            if (isTabSwitched) {
+            const initialedStateAndParams = initiatorId in itemsStateAndParams &&
+                itemsStateAndParams[initiatorId];
+            const needResetCurrentAP = initialedStateAndParams &&
+                Object.keys((0, shared_1.pickActionParamsFromParams)(initialedStateAndParams.params)).length &&
+                !Object.keys(allowableActionParams).length;
+            if (isTabSwitched || needResetCurrentAP) {
                 commandUpdateParams = '$set';
             }
             const obj = {

package/build/esm/shared/modules/helpers.d.ts

@@ -69,4 +69,13 @@ export declare function hasActionParam(conf?: StringParams): boolean;
  * @param stateAndParams
  */
 export declare function hasActionParams(stateAndParams: ItemStateAndParams): boolean;
+/**
+ * Collect array of actionParams keys with prefix (_ap_) that must be cleared from widget defaults
+ * @param defaultWidgetParams
+ * @param queueWidgetParams
+ */
+export declare function getDefaultsActionParamsToClear({ defaultWidgetParams, queueWidgetParams, }: {
+    defaultWidgetParams: StringParams;
+    queueWidgetParams: StringParams;
+}): string[];
 export {};

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

@@ -3,6 +3,7 @@ import get from 'lodash/get';
 import invert from 'lodash/invert';
 import isEmpty from 'lodash/isEmpty';
 import pick from 'lodash/pick';
+import intersection from 'lodash/intersection';
 import { META_KEY, CURRENT_VERSION, ACTION_PARAM_PREFIX } from '../constants';
 function getNormalizedPlugins(plugins) {
     return keyBy(plugins, 'type');
@@ -239,3 +240,22 @@ export function hasActionParams(stateAndParams) {
     }
     return hasActionParam(stateAndParams.params);
 }
+/**
+ * Collect array of actionParams keys with prefix (_ap_) that must be cleared from widget defaults
+ * @param defaultWidgetParams
+ * @param queueWidgetParams
+ */
+export function getDefaultsActionParamsToClear({ defaultWidgetParams, queueWidgetParams, }) {
+    const widgetDefaultsWithActionParams = hasActionParam(defaultWidgetParams)
+        ? pickActionParamsFromParams(defaultWidgetParams)
+        : null;
+    if (!widgetDefaultsWithActionParams) {
+        return [];
+    }
+    // clear default actionParams if some param with the same name without prefix affected on current widget
+    // ex.: queueWidgetParams contain {Year: 1970} and default actionParams contain {_ap_Year: 2000}
+    const actionParamKeyToClear = intersection(Object.keys(queueWidgetParams), Object.keys(widgetDefaultsWithActionParams));
+    return actionParamKeyToClear.length
+        ? actionParamKeyToClear.map((key) => `${ACTION_PARAM_PREFIX}${key}`)
+        : [];
+}

package/build/esm/shared/modules/state-and-params.js

@@ -1,6 +1,8 @@
 import groupBy from 'lodash/groupBy';
+import intersection from 'lodash/intersection';
+import omit from 'lodash/omit';
 import { META_KEY } from '../constants';
-import { prerenderItems, formQueueData, getMapItemsIgnores, mergeParamsWithAliases, getCurrentVersion, pickActionParamsFromParams, hasActionParam, pickExceptActionParamsFromParams, isItemWithTabs, resolveItemInnerId, } from './helpers';
+import { prerenderItems, formQueueData, getMapItemsIgnores, mergeParamsWithAliases, getCurrentVersion, pickActionParamsFromParams, hasActionParam, pickExceptActionParamsFromParams, transformParamsToActionParams, isItemWithTabs, resolveItemInnerId, getDefaultsActionParamsToClear, } from './helpers';
 export function getItemsParams({ defaultGlobalParams = {}, globalParams = {}, config, itemsStateAndParams, plugins, }) {
     const { aliases, connections } = config;
     const items = prerenderItems({ items: config.items, plugins });
@@ -48,7 +50,8 @@ export function getItemsParams({ defaultGlobalParams = {}, globalParams = {}, co
         }
         else {
             // params according to queue of its applying
-            let queueDataItemsParams = {};
+            let prevQueueDataWithActionParams = {};
+            let queueDataItems = {};
             for (const data of Object.values(queueData)) {
                 if (data.namespace !== namespace || itemIgnores.includes(data.id)) {
                     continue;
@@ -61,9 +64,24 @@ export function getItemsParams({ defaultGlobalParams = {}, globalParams = {}, co
                     params = pickExceptActionParamsFromParams(data.params);
                 }
                 const mergedParams = getMergedParams(params, actionParams);
-                queueDataItemsParams = Object.assign(Object.assign({}, queueDataItemsParams), mergedParams);
+                const actionParamKeyToClear = intersection(Object.keys(transformParamsToActionParams(mergedParams)), Object.keys(prevQueueDataWithActionParams));
+                let queueDataRes = Object.assign({}, queueDataItems);
+                if (actionParamKeyToClear.length) {
+                    queueDataRes = omit(queueDataItems, actionParamKeyToClear);
+                }
+                queueDataItems = Object.assign(Object.assign({}, queueDataRes), mergedParams);
+                prevQueueDataWithActionParams = hasActionParam(queueDataItems)
+                    ? pickActionParamsFromParams(data.params, true)
+                    : {};
+            }
+            const clearActionParams = getDefaultsActionParamsToClear({
+                defaultWidgetParams,
+                queueWidgetParams: queueDataItems,
+            });
+            if (clearActionParams.length) {
+                defaultWidgetParams = omit(defaultWidgetParams, clearActionParams);
             }
-            itemParams = Object.assign(itemParams, queueDataItemsParams);
+            itemParams = Object.assign(itemParams, queueDataItems);
         }
         return Object.assign(Object.assign({}, itemsParams), { [id]: Object.assign(Object.assign({}, defaultWidgetParams), itemParams) });
     }, {});

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

@@ -302,7 +302,6 @@ const stateAndParamsForAP2 = {
                 Country: 'Belgium',
                 Year: '',
                 'd079937f-6bc4-4133-9171-40092bb20d6f': 'Belgium',
-                _ap_Country: 'Italy',
             },
             state: {},
         },
@@ -331,7 +330,6 @@ const stateAndParamsForAP3 = {
                 Country: '',
                 Year: '',
                 'd079937f-6bc4-4133-9171-40092bb20d6f': '',
-                _ap_Country: 'Italy',
             },
             state: {},
         },
@@ -408,64 +406,6 @@ const stateAndParamsForAP5 = {
         },
     },
 };
-const stateAndParamsForAP6 = {
-    in: {
-        Q8: {
-            params: {
-                _ap_Year: '2021',
-                _ap_Country: 'Russia',
-            },
-        },
-        L5: {
-            params: {
-                _ap_Country: 'Russia',
-                _ap_Name: 'Alex',
-                _ap_Price: '1000',
-            },
-        },
-        __meta__: {
-            queue: [
-                { id: 'Q8', tabId: 'K0' },
-                { id: 'L5', tabId: 'K1' },
-            ],
-            version: 2,
-        },
-    },
-    out: {
-        L5: {
-            params: {
-                Name: '',
-                Price: '',
-                Year: '2021',
-                Country: 'Russia',
-                _ap_Country: 'Russia',
-                _ap_Name: 'Alex',
-                _ap_Price: '1000',
-            },
-            state: {},
-        },
-        Q8: {
-            params: {
-                Year: '',
-                Country: 'Russia',
-                Name: 'Alex',
-                Price: '1000',
-                _ap_Year: '2021',
-                _ap_Country: 'Russia',
-            },
-            state: {},
-        },
-        al: {
-            params: {
-                Country: 'Russia',
-                Name: 'Alex',
-                Price: '1000',
-                Year: '2021',
-            },
-            state: {},
-        },
-    },
-};
 const configs = mockConfigs.configs;
 describe('getItemsStateAndParamsDL', () => {
     describe('old version fallback', () => {
@@ -558,15 +498,4 @@ describe('getItemsStateAndParams actionParams variants check', () => {
             expect(resultItemsStateAndParams).toEqual(omit(stateAndParamsForAP5.out, META_KEY));
         });
     });
-    describe('action and params state 6', () => {
-        const resultItemsStateAndParams = getItemsStateAndParamsDL({
-            defaultGlobalParams: {},
-            globalParams: {},
-            config: configs[4],
-            itemsStateAndParams: stateAndParamsForAP6.in,
-        });
-        it('return stateAndParamsForAP6.out', () => {
-            expect(resultItemsStateAndParams).toEqual(omit(stateAndParamsForAP6.out, META_KEY));
-        });
-    });
 });

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

@@ -258,7 +258,12 @@ export class UpdateManager {
             let commandUpdateParams = ((_b = itemsStateAndParams[initiatorId]) === null || _b === void 0 ? void 0 : _b.params)
                 ? '$merge'
                 : '$set';
-            if (isTabSwitched) {
+            const initialedStateAndParams = initiatorId in itemsStateAndParams &&
+                itemsStateAndParams[initiatorId];
+            const needResetCurrentAP = initialedStateAndParams &&
+                Object.keys(pickActionParamsFromParams(initialedStateAndParams.params)).length &&
+                !Object.keys(allowableActionParams).length;
+            if (isTabSwitched || needResetCurrentAP) {
                 commandUpdateParams = '$set';
             }
             const obj = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/dashkit",
-  "version": "6.6.1-beta-v.shangin.0",
+  "version": "6.6.1-beta-v.marginy.0",
   "description": "Library for rendering dashboard grid layout",
   "license": "MIT",
   "repository": {