@gravity-ui/dashkit 6.6.1 → 6.7.1

package/build/cjs/components/Item/Item.d.ts

@@ -1,7 +1,7 @@
 declare const _default: {
     new (props: any): {
         shouldComponentUpdate(nextProps: any): boolean;
-        _onStateAndParamsChange: (stateAndParams: any) => void;
+        _onStateAndParamsChange: (stateAndParams: any, options: any) => void;
         render(): JSX.Element;
         context: unknown;
         setState<K extends string | number | symbol>(state: any, callback?: (() => void) | undefined): void;
@@ -25,7 +25,7 @@ declare const _default: {
     };
     new (props: any, context: any): {
         shouldComponentUpdate(nextProps: any): boolean;
-        _onStateAndParamsChange: (stateAndParams: any) => void;
+        _onStateAndParamsChange: (stateAndParams: any, options: any) => void;
         render(): JSX.Element;
         context: unknown;
         setState<K extends string | number | symbol>(state: any, callback?: (() => void) | undefined): void;

package/build/cjs/hocs/prepareItem.d.ts

@@ -1,7 +1,7 @@
 export function prepareItem(Component: any): {
     new (props: any): {
         shouldComponentUpdate(nextProps: any): boolean;
-        _onStateAndParamsChange: (stateAndParams: any) => void;
+        _onStateAndParamsChange: (stateAndParams: any, options: any) => void;
         render(): JSX.Element;
         context: unknown;
         setState<K extends string | number | symbol>(state: any, callback?: (() => void) | undefined): void;
@@ -25,7 +25,7 @@ export function prepareItem(Component: any): {
     };
     new (props: any, context: any): {
         shouldComponentUpdate(nextProps: any): boolean;
-        _onStateAndParamsChange: (stateAndParams: any) => void;
+        _onStateAndParamsChange: (stateAndParams: any, options: any) => void;
         render(): JSX.Element;
         context: unknown;
         setState<K extends string | number | symbol>(state: any, callback?: (() => void) | undefined): void;

package/build/cjs/hocs/prepareItem.js

@@ -10,8 +10,8 @@ function prepareItem(Component) {
     return _a = class PrepareItem extends react_1.default.Component {
             constructor() {
                 super(...arguments);
-                this._onStateAndParamsChange = (stateAndParams) => {
-                    this.context.onItemStateAndParamsChange(this.props.id, stateAndParams);
+                this._onStateAndParamsChange = (stateAndParams, options) => {
+                    this.context.onItemStateAndParamsChange(this.props.id, stateAndParams, options);
                 };
             }
             shouldComponentUpdate(nextProps) {

package/build/cjs/hocs/withContext.js

@@ -51,13 +51,14 @@ function useMemoStateContext(props) {
             itemsStateAndParams: props.itemsStateAndParams,
         }));
     }, [props.config, props.itemsStateAndParams, onChange]);
-    const onItemStateAndParamsChange = react_1.default.useCallback((id, stateAndParams) => {
+    const onItemStateAndParamsChange = react_1.default.useCallback((id, stateAndParams, options) => {
         onChange({
             itemsStateAndParams: utils_1.UpdateManager.changeStateAndParams({
                 id,
                 config: props.config,
                 stateAndParams,
                 itemsStateAndParams: props.itemsStateAndParams,
+                options,
             }),
         });
     }, [props.config, props.itemsStateAndParams, onChange]);

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

@@ -69,13 +69,4 @@ 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,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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');
@@ -260,23 +259,3 @@ 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,8 +3,6 @@ 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, }) {
@@ -54,8 +52,7 @@ function getItemsParams({ defaultGlobalParams = {}, globalParams = {}, config, i
         }
         else {
             // params according to queue of its applying
-            let prevQueueDataWithActionParams = {};
-            let queueDataItems = {};
+            let queueDataItemsParams = {};
             for (const data of Object.values(queueData)) {
                 if (data.namespace !== namespace || itemIgnores.includes(data.id)) {
                     continue;
@@ -68,24 +65,9 @@ function getItemsParams({ defaultGlobalParams = {}, globalParams = {}, config, i
                     params = (0, helpers_1.pickExceptActionParamsFromParams)(data.params);
                 }
                 const mergedParams = getMergedParams(params, actionParams);
-                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);
+                queueDataItemsParams = Object.assign(Object.assign({}, queueDataItemsParams), mergedParams);
             }
-            itemParams = Object.assign(itemParams, queueDataItems);
+            itemParams = Object.assign(itemParams, queueDataItemsParams);
         }
         return Object.assign(Object.assign({}, itemsParams), { [id]: Object.assign(Object.assign({}, defaultWidgetParams), itemParams) });
     }, {});

package/build/cjs/shared/types/state-and-params.d.ts

@@ -18,5 +18,8 @@ export type ItemStateAndParams = {
     params?: StringParams;
     state?: ItemState;
 };
+export type ItemStateAndParamsChangeOptions = {
+    action: 'setParams' | 'removeItem';
+};
 export type ItemsStateAndParamsBase = Record<string, ItemStateAndParams>;
 export type ItemsStateAndParams = ItemsStateAndParamsBase | StateAndParamsMeta;

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

@@ -306,6 +306,7 @@ const stateAndParamsForAP2 = {
                 Country: 'Belgium',
                 Year: '',
                 'd079937f-6bc4-4133-9171-40092bb20d6f': 'Belgium',
+                _ap_Country: 'Italy',
             },
             state: {},
         },
@@ -334,6 +335,7 @@ const stateAndParamsForAP3 = {
                 Country: '',
                 Year: '',
                 'd079937f-6bc4-4133-9171-40092bb20d6f': '',
+                _ap_Country: 'Italy',
             },
             state: {},
         },
@@ -410,6 +412,64 @@ 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', () => {
@@ -502,4 +562,15 @@ 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/typings/plugin.d.ts

@@ -1,13 +1,13 @@
 import React from 'react';
 import { ContextProps, SettingsProps, WidgetLayout } from './common';
-import { StringParams, ConfigItem, ItemState, ItemStateAndParams, PluginBase } from '../shared';
+import { StringParams, ConfigItem, ItemState, ItemStateAndParams, PluginBase, ItemStateAndParamsChangeOptions } from '../shared';
 import type { ReactGridLayoutProps } from 'react-grid-layout';
 export interface PluginWidgetProps {
     id: string;
     editMode: boolean;
     params: StringParams;
     state: ItemState;
-    onStateAndParamsChange: (stateAndParams: ItemStateAndParams) => void;
+    onStateAndParamsChange: (stateAndParams: ItemStateAndParams, options?: ItemStateAndParamsChangeOptions) => void;
     width: number;
     height: number;
     data: ConfigItem['data'];

package/build/cjs/utils/__tests__/update-manager.test.d.ts

@@ -0,0 +1 @@
+export {};