@infomaximum/widget-sdk 4.0.0-beta1 → 4.0.0-beta10

package/dist/index.d.ts

@@ -33,7 +33,9 @@ declare enum EControlType {
     displayCondition = "displayCondition",
     eventsColor = "eventsColor",
     inputMarkdown = "inputMarkdown",
-    filter = "filter"
+    filter = "filter",
+    actionOnClick = "actionOnClick",
+    eventsPicker = "eventsPicker"
 }
 /** Конфигурация элемента управления настройкой */
 interface IControlRecord<Settings extends object, Value, ControlType = EControlType> {
@@ -63,6 +65,12 @@ interface ICalculator<Input, Output> {
 }
 interface ICalculatorIndicatorInput {
     alias: string;
+    /**
+     * Информация о типе данных:
+     * - Если тип не передан, не производится дополнительной обработки формулы.
+     * - Если передан тип "OTHER", формула дополнительно будет обернута в toString().
+     */
+    dataType?: ESimpleDataType;
     displayConditionFormula?: TNullable<string>;
 }
 interface ICalculatorIndicatorOutput {
@@ -253,6 +261,7 @@ declare enum EDurationUnit {
 declare const mapFormulaFilterToCalculatorInput: (filterValue: IFormulaFilterValue | string) => TNullable<ICalculatorFilter>;
 declare const mapFormulaFiltersToInputs: (filters: (string | IFormulaFilterValue)[]) => ICalculatorFilter[];
 
+type TSelectivePartial<T, Keys extends keyof T> = Omit<T, Keys> & Partial<Pick<T, Keys>>;
 declare const formulaFilterMethods: {
     readonly LAST_TIME: "LAST_TIME";
     readonly EQUAL_TO: ECalculatorFilterMethods.EQUAL_TO;
@@ -282,6 +291,7 @@ declare enum EProcessFilterNames {
     /** Длительность перехода */
     durationOfTransition = "durationOfTransition"
 }
+/** @deprecated необходимо использовать @see {@link IFormulaFilterValue} */
 interface IWidgetFormulaFilterValue extends ICalculatorFilter {
     /**
      * Название фильтра
@@ -298,16 +308,16 @@ interface IProcessFilterValue {
      * События, доступные при выборе процесса.
      * Если параметр не передан, используются все события процесса на основе запроса к вычислителю.
      */
-    eventsNamesByProcessGuidMap?: Map<string, (string | null)[]>;
+    eventsNamesByProcessNameMap?: Map<string, (string | null)[]>;
 }
 interface IProcessEventFilterValue extends IProcessFilterValue {
-    processGuid: string;
+    processName: string;
     eventName: string;
 }
 interface IProcessTransitionFilterValue extends IProcessFilterValue {
-    startEventProcessGuid: string;
+    startEventProcessName: string;
     startEventName: string;
-    endEventProcessGuid: string;
+    endEventProcessName: string;
     endEventName: string;
 }
 interface IAddPresenceOfEventFilter {
@@ -322,15 +332,6 @@ interface IAddPresenceOfTransitionFilter {
 interface IAddDurationOfTransitionFilter {
     (name: EProcessFilterNames.durationOfTransition, value: IProcessTransitionFilterValue): void;
 }
-interface IWidgetFiltration {
-    /** Значения фильтров, подготовленные для передачи в вычислитель */
-    preparedFilterValues: ICalculatorFilter[];
-    /** Добавить фильтр по формуле */
-    addFormulaFilter(value: IWidgetFormulaFilterValue): void;
-    /** Удалить фильтр по формуле */
-    removeFormulaFilter(formula: string): void;
-    addProcessFilter(...args: Parameters<IAddPresenceOfEventFilter> | Parameters<IAddRepetitionOfEventFilter> | Parameters<IAddPresenceOfTransitionFilter> | Parameters<IAddDurationOfTransitionFilter>): void;
-}
 declare enum EFormulaFilterFieldKeys {
     date = "date",
     dateRange = "dateRange",
@@ -354,7 +355,7 @@ interface IFormulaFilterValue {
     /** Метод фильтрации */
     filteringMethod: valueof<typeof formulaFilterMethods>;
     /** Выбранные в списке значения в виде моделей */
-    checkedValues: string[];
+    checkedValues: (string | null)[];
     /** Значения полей формы редактора */
     formValues: Partial<{
         [EFormulaFilterFieldKeys.date]: string | null;
@@ -368,14 +369,41 @@ interface IFormulaFilterValue {
         [EFormulaFilterFieldKeys.durationUnit]: EDurationUnit;
     }>;
 }
-
-interface IPlacement {
-    left: number;
-    top: number;
-    width: number;
-    height: number;
-    zIndex: number;
+interface IStagesFilterItem {
+    /** Название этапа */
+    name: string;
+    /** Формула фильтра этапа */
+    formula: string;
+    isSelected: boolean;
+}
+interface IStagesFilterValue {
+    /** Ключ виджета */
+    widgetKey: string;
+    /** Заголовок фильтра */
+    name: TNullable<string>;
+    /** Этапы */
+    stages: IStagesFilterItem[];
+}
+type TWidgetFilterValue = IFormulaFilterValue | IStagesFilterValue | IProcessEventFilterValue | IProcessTransitionFilterValue;
+interface IWidgetFilter {
+    filterValue: TWidgetFilterValue;
+    preparedFilterValue: ICalculatorFilter;
+}
+interface IWidgetFiltration {
+    /** Значения фильтров, подготовленные для передачи в вычислитель */
+    preparedFilterValues: ICalculatorFilter[];
+    filters: IWidgetFilter[];
+    /** Добавить фильтр по формуле */
+    addFormulaFilter(value: IWidgetFormulaFilterValue | TSelectivePartial<IFormulaFilterValue, "format" | "formValues">): void;
+    /** Удалить фильтр по формуле */
+    removeFormulaFilter(formula: string): void;
+    addProcessFilter(...args: Parameters<IAddPresenceOfEventFilter> | Parameters<IAddRepetitionOfEventFilter> | Parameters<IAddPresenceOfTransitionFilter> | Parameters<IAddDurationOfTransitionFilter>): void;
+    /** Добавить фильтр по этапам */
+    addStagesFilter(value: Omit<IStagesFilterValue, "widgetKey">): void;
+    /** Удалить фильтр по этапам */
+    removeStagesFilter(widgetKey: string): void;
 }
+
 declare enum EWidgetFilterMode {
     DEFAULT = "DEFAULT",
     SINGLE = "SINGLE",
@@ -423,7 +451,7 @@ type TDisplayCondition = {
     formula: TNullable<string>;
 } | {
     mode: EDisplayConditionMode.VARIABLE;
-    variableGuid: TNullable<string>;
+    variableName: TNullable<string>;
     variableValue: TNullable<string>;
 };
 interface IRange {
@@ -457,7 +485,7 @@ type TWidgetSortingValue = {
     formula: string;
 } | TWidgetSortingValueRelatedWidgetIndicator | {
     mode: ESortingValueModes.IN_DASHBOARD | ESortingValueModes.IN_WORKSPACE;
-    guid: string;
+    name: string;
     formula: string;
 };
 
@@ -540,7 +568,6 @@ declare enum ESortingValueModes {
     IN_WORKSPACE = "IN_WORKSPACE"
 }
 interface ICommonColumnIndicator {
-    guid: string;
     name: string;
     formula: string;
 }
@@ -658,8 +685,8 @@ interface IWidgetTableColumn {
     dataType: ESimpleDataType;
 }
 interface IActionScript {
-    guid: string | undefined;
-    fieldsGuids: Set<string>;
+    name: string | undefined;
+    fieldsNames: Set<string>;
 }
 interface IWidgetTable {
     /** Имя таблицы */
@@ -682,8 +709,8 @@ interface IWidgetsContext {
     /** Переменные отчета */
     variables: Map<string, TWidgetVariable>;
     /** Метод установки значения переменной отчета */
-    setVariableValue(guid: string, value: TNullable<string> | string[]): void;
-    statesGuids: Set<string>;
+    setVariableValue(name: string, value: TNullable<string> | string[]): void;
+    statesNames: Set<string>;
     reportName: string;
     /**
      * режим дашборда
@@ -711,7 +738,7 @@ type TWidgetActionInputValue = {
     columnName: string;
 } | {
     mode: EWidgetActionInputMode.FROM_VARIABLE;
-    guid: string;
+    name: string;
 } | {
     mode: EWidgetActionInputMode.FORMULA;
     formula: string;
@@ -728,7 +755,7 @@ type TWidgetActionInputValue = {
     defaultValue: string;
 };
 interface IWidgetActionInput {
-    guid: string;
+    name: string;
     value: TWidgetActionInputValue;
 }
 interface IWidgetAction {
@@ -736,24 +763,22 @@ interface IWidgetAction {
     name: string;
     description: string;
     filters: (IFormulaFilterValue | string)[];
-    scriptGuid?: string;
     /**  Поле name необходимо, чтобы показать название скрипта, который был удален */
     scriptName?: string;
     inputs: IWidgetActionInput[];
     shouldRefreshWidgetsAfterExecution: boolean;
 }
-declare const isActionValid: (action: IWidgetAction, { scripts, tables }: IWidgetsContext) => boolean;
+declare const isActionValid: (action: IWidgetAction, { scripts, tables, variables }: IWidgetsContext) => boolean;
 
 interface IBaseWidgetSettings {
     apiVersion: string;
     type: string;
     header?: string;
     headerSize?: number;
-    stateGuid?: string | null;
+    stateName?: string | null;
     filters?: (IFormulaFilterValue | string)[];
     filterMode?: EWidgetFilterMode;
     ignoreFilters?: boolean;
-    placement: IPlacement;
     sorting?: IWidgetSortingIndicator[];
     actions?: IWidgetAction[];
     displayCondition?: TDisplayCondition;
@@ -992,7 +1017,7 @@ interface IEdge extends IGraphElement {
     endName: string | null;
 }
 interface IProcessGraphCalculatorInput {
-    processGuid: string;
+    processName: string;
     vertexLimit: number | null;
     edgeLimit: number;
     vertexMeasures: ICalculatorMeasureInput[];
@@ -1124,6 +1149,8 @@ declare function bindContentWithIndicator<Output extends ICalculatorIndicatorOut
  */
 declare function bindContentsWithIndicators<Output extends ICalculatorIndicatorOutput, Indicator extends IWidgetIndicator>(outputs: Map<string, Output>, indicators: Indicator[]): TBoundedContentWithIndicator<Output, Indicator>[];
 
+declare const escapeSpecialCharacters: (formula: string) => string;
+
 interface ICalculatorFactory {
     general: () => IGeneralCalculator;
     pie: () => IPieCalculator;
@@ -1144,6 +1171,16 @@ interface IDefinition<WidgetSettings extends IBaseWidgetSettings, GroupSettings
     getMeasures?(settings: WidgetSettings): IWidgetMeasure[];
 }
 
+type TLaunchActionParams = {
+    action: IWidgetAction;
+    onSuccess: () => void;
+    filters: ICalculatorFilter[];
+    needConfirmation?: boolean;
+};
+type TWidgetContainer = {
+    /** Имеет ли контейнер виджета ограниченную максимальную высоту */
+    isMaxHeightLimited: boolean;
+};
 interface IWidgetProps<WidgetSettings extends IBaseWidgetSettings = IBaseWidgetSettings> {
     /** guid виджета */
     guid: string;
@@ -1164,14 +1201,12 @@ interface IWidgetProps<WidgetSettings extends IBaseWidgetSettings = IBaseWidgetS
     rootViewContainer: HTMLDivElement;
     /** Объект для управления плейсхолдером */
     placeholder: IWidgetPlaceholderController;
-    /** Контекст виджета */
+    /** Контекст виджетов */
     widgetsContext: IWidgetsContext;
-    /** Вызывает модальное окно для запуска действия */
-    launchAction(params: {
-        action: IWidgetAction;
-        onSuccess: () => void;
-        filters: ICalculatorFilter[];
-    }): void;
+    /** Данные о контейнере виджета */
+    widgetContainer: TWidgetContainer;
+    /** Запуск действия */
+    launchAction(params: TLaunchActionParams): void;
 }
 interface ICustomWidgetProps<WidgetSettings extends IBaseWidgetSettings = IBaseWidgetSettings> extends IWidgetProps<WidgetSettings> {
     /** @deprecated - нужно использовать из widgetsContext */
@@ -1343,4 +1378,4 @@ declare global {
     }
 }
 
-export { ECalculatorFilterMethods, EColorMode, EControlType, EDbType, EDimensionTemplateNames, EDisplayConditionMode, EDurationUnit, EEventMeasureTemplateNames, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMeasureTemplateNames, EProcessFilterNames, ESimpleDataType, ESortDirection, ESortingValueModes, ETransitionMeasureTemplateNames, EWidgetActionInputMode, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, type IActionScript, type IAddDurationOfTransitionFilter, type IAddPresenceOfEventFilter, type IAddPresenceOfTransitionFilter, type IAddRepetitionOfEventFilter, type IBaseDimensionsAndMeasuresCalculator, type IBaseDimensionsAndMeasuresCalculatorInput, type IBaseDimensionsAndMeasuresCalculatorOutput, type IBaseWidgetSettings, type ICalculator, type ICalculatorDimensionInput, type ICalculatorDimensionOutput, type ICalculatorFactory, type ICalculatorFilter, type ICalculatorIndicatorInput, type ICalculatorIndicatorOutput, type ICalculatorMeasureInput, type ICalculatorMeasureOutput, type ICalculatorVariable, type ICalculatorVariablesValues, type ICommonColumnIndicator, type IControlRecord, type ICustomAddButtonProps, type ICustomWidgetProps, type IDefinition, type IDimensionSelection, type IDimensionSelectionByFormula, type IDisplayPredicate, type IDivePanelDescription, type IDividerRecord, type IEdge, type IExportColumnOrder, type IFillSettings, type IFormulaFilterValue, type IGeneralCalculator, type IGeneralCalculatorExportInput, type IGeneralCalculatorInput, type IGeneralCalculatorOutput, type IGraphElement, type IGroupSetDescription, type IGroupSetRecord, type IGroupSettings, type IHistogramBin, type IHistogramCalculator, type IHistogramCalculatorInput, type IHistogramCalculatorOutput, type ILens, type IPanelDescription, type IPanelDescriptionCreator, type IPieCalculator, type IPieCalculatorInput, type IPieCalculatorOutput, type IPlacement, type IProcessEventFilterValue, type IProcessEventIndicator, type IProcessGraphCalculator, type IProcessGraphCalculatorInput, type IProcessGraphCalculatorOutput, type IProcessIndicator, type IProcessTransitionFilterValue, type IProcessTransitionIndicator, type IRange, type ISelectOption, type ISortOrder, type ITwoLimitsCalculator, type ITwoLimitsCalculatorExportInput, type ITwoLimitsCalculatorInput, type ITwoLimitsCalculatorOutput, type ITypeCalculator, type ITypeCalculatorInput, type ITypeCalculatorOutput, type IVertex, type IWidget, type IWidgetAction, type IWidgetActionInput, type IWidgetColumnIndicator, type IWidgetDimension, type IWidgetDimensionHierarchy, type IWidgetEntity, type IWidgetFiltration, type IWidgetFormatting, type IWidgetFormulaFilterValue, type IWidgetIndicator, type IWidgetMeasure, type IWidgetPlaceholderController, type IWidgetProcess, type IWidgetProps, type IWidgetSortingIndicator, type IWidgetTable, type IWidgetTableColumn, type IWidgetsContext, type TBoundedContentWithIndicator, type TColor, type TColumnIndicatorValue, type TDefineWidgetOptions, type TDisplayCondition, type TDisplayMode, type TEmptyRecord, type TGroupLevelRecord, type TProcessIndicatorValue, type TRecordAccessor, type TSortDirection, type TUpdateSelection, type TValuePath, type TWidgetActionInputValue, type TWidgetFiltering, type TWidgetLevelRecord, type TWidgetSortingValue, type TWidgetSortingValueRelatedWidgetDimension, type TWidgetSortingValueRelatedWidgetIndicator, type TWidgetSortingValueRelatedWidgetMeasure, type TWidgetVariable, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, dimensionTemplateFormulas, eventMeasureTemplateFormulas, fillTemplateString, formulaFilterMethods, generateColumnFormula, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getTransitionMeasureFormula, isActionValid, isHierarchy, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, mapVariablesToInputs, measureTemplateFormulas, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, transitionMeasureTemplateFormulas, updateDefaultModeSelection, updateMultiModeSelection, updateSingleModeSelection };
+export { ECalculatorFilterMethods, EColorMode, EControlType, EDbType, EDimensionTemplateNames, EDisplayConditionMode, EDurationUnit, EEventMeasureTemplateNames, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMeasureTemplateNames, EProcessFilterNames, ESimpleDataType, ESortDirection, ESortingValueModes, ETransitionMeasureTemplateNames, EWidgetActionInputMode, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, type IActionScript, type IAddDurationOfTransitionFilter, type IAddPresenceOfEventFilter, type IAddPresenceOfTransitionFilter, type IAddRepetitionOfEventFilter, type IBaseDimensionsAndMeasuresCalculator, type IBaseDimensionsAndMeasuresCalculatorInput, type IBaseDimensionsAndMeasuresCalculatorOutput, type IBaseWidgetSettings, type ICalculator, type ICalculatorDimensionInput, type ICalculatorDimensionOutput, type ICalculatorFactory, type ICalculatorFilter, type ICalculatorIndicatorInput, type ICalculatorIndicatorOutput, type ICalculatorMeasureInput, type ICalculatorMeasureOutput, type ICalculatorVariable, type ICalculatorVariablesValues, type ICommonColumnIndicator, type IControlRecord, type ICustomAddButtonProps, type ICustomWidgetProps, type IDefinition, type IDimensionSelection, type IDimensionSelectionByFormula, type IDisplayPredicate, type IDivePanelDescription, type IDividerRecord, type IEdge, type IExportColumnOrder, type IFillSettings, type IFormulaFilterValue, type IGeneralCalculator, type IGeneralCalculatorExportInput, type IGeneralCalculatorInput, type IGeneralCalculatorOutput, type IGraphElement, type IGroupSetDescription, type IGroupSetRecord, type IGroupSettings, type IHistogramBin, type IHistogramCalculator, type IHistogramCalculatorInput, type IHistogramCalculatorOutput, type ILens, type IPanelDescription, type IPanelDescriptionCreator, type IPieCalculator, type IPieCalculatorInput, type IPieCalculatorOutput, type IProcessEventFilterValue, type IProcessEventIndicator, type IProcessGraphCalculator, type IProcessGraphCalculatorInput, type IProcessGraphCalculatorOutput, type IProcessIndicator, type IProcessTransitionFilterValue, type IProcessTransitionIndicator, type IRange, type ISelectOption, type ISortOrder, type IStagesFilterValue, type ITwoLimitsCalculator, type ITwoLimitsCalculatorExportInput, type ITwoLimitsCalculatorInput, type ITwoLimitsCalculatorOutput, type ITypeCalculator, type ITypeCalculatorInput, type ITypeCalculatorOutput, type IVertex, type IWidget, type IWidgetAction, type IWidgetActionInput, type IWidgetColumnIndicator, type IWidgetDimension, type IWidgetDimensionHierarchy, type IWidgetEntity, type IWidgetFilter, type IWidgetFiltration, type IWidgetFormatting, type IWidgetFormulaFilterValue, type IWidgetIndicator, type IWidgetMeasure, type IWidgetPlaceholderController, type IWidgetProcess, type IWidgetProps, type IWidgetSortingIndicator, type IWidgetTable, type IWidgetTableColumn, type IWidgetsContext, type TBoundedContentWithIndicator, type TColor, type TColumnIndicatorValue, type TDefineWidgetOptions, type TDisplayCondition, type TDisplayMode, type TEmptyRecord, type TGroupLevelRecord, type TLaunchActionParams, type TProcessIndicatorValue, type TRecordAccessor, type TSelectivePartial, type TSortDirection, type TUpdateSelection, type TValuePath, type TWidgetActionInputValue, type TWidgetContainer, type TWidgetFilterValue, type TWidgetFiltering, type TWidgetLevelRecord, type TWidgetSortingValue, type TWidgetSortingValueRelatedWidgetDimension, type TWidgetSortingValueRelatedWidgetIndicator, type TWidgetSortingValueRelatedWidgetMeasure, type TWidgetVariable, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, dimensionTemplateFormulas, escapeSpecialCharacters, eventMeasureTemplateFormulas, fillTemplateString, formulaFilterMethods, generateColumnFormula, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getTransitionMeasureFormula, isActionValid, isHierarchy, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, mapVariablesToInputs, measureTemplateFormulas, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, transitionMeasureTemplateFormulas, updateDefaultModeSelection, updateMultiModeSelection, updateSingleModeSelection };

package/dist/index.esm.js

@@ -73,22 +73,23 @@ var EWidgetActionInputMode;
 })(EWidgetActionInputMode || (EWidgetActionInputMode = {}));
 var isActionValid = function (action, _a) {
     var _b;
-    var scripts = _a.scripts, tables = _a.tables;
-    var currentScript = scripts.get((_b = action.scriptGuid) !== null && _b !== void 0 ? _b : "");
+    var scripts = _a.scripts, tables = _a.tables, variables = _a.variables;
+    var currentScript = scripts.get((_b = action.scriptName) !== null && _b !== void 0 ? _b : "");
     if (!currentScript) {
         return false;
     }
-    var actionInputsMap = new Map(action.inputs.map(function (input) { return [input.guid, input]; }));
-    if (actionInputsMap.size < currentScript.fieldsGuids.size) {
+    var actionInputsMap = new Map(action.inputs.map(function (input) { return [input.name, input]; }));
+    if (actionInputsMap.size < currentScript.fieldsNames.size) {
         return false;
     }
-    return __spreadArray([], __read(currentScript.fieldsGuids), false).every(function (guid) {
-        var actionInput = actionInputsMap.get(guid !== null && guid !== void 0 ? guid : "");
+    return __spreadArray([], __read(currentScript.fieldsNames), false).every(function (name) {
+        var actionInput = actionInputsMap.get(name !== null && name !== void 0 ? name : "");
         if (!actionInput) {
             return false;
         }
         var value = actionInput.value;
-        if (value.mode === EWidgetActionInputMode.FROM_VARIABLE && !value.guid) {
+        if (value.mode === EWidgetActionInputMode.FROM_VARIABLE &&
+            !variables.has(value.name)) {
             return false;
         }
         if (value.mode === EWidgetActionInputMode.FORMULA && !value.formula) {
@@ -491,8 +492,8 @@ var EDisplayConditionMode;
 function checkDisplayCondition(displayCondition, variables) {
     var _a;
     if ((displayCondition === null || displayCondition === void 0 ? void 0 : displayCondition.mode) === EDisplayConditionMode.VARIABLE) {
-        var variableGuid = displayCondition.variableGuid, variableValue = displayCondition.variableValue;
-        var currentVariableValue = variableGuid && ((_a = variables.get(variableGuid)) === null || _a === void 0 ? void 0 : _a.value);
+        var variableName = displayCondition.variableName, variableValue = displayCondition.variableValue;
+        var currentVariableValue = variableName && ((_a = variables.get(variableName)) === null || _a === void 0 ? void 0 : _a.value);
         var isCurrentVariableMatch = Array.isArray(currentVariableValue)
             ? !!variableValue && (currentVariableValue === null || currentVariableValue === void 0 ? void 0 : currentVariableValue.includes(variableValue))
             : currentVariableValue === variableValue;
@@ -513,8 +514,18 @@ var replaceDisplayCondition = function (dimension, displayCondition) {
         : __assign(__assign({}, dimension), { displayCondition: displayCondition });
 };
 
+var escapeSpecialCharacters = function (formula) {
+    return formula
+        .replaceAll("\\", "\\\\")
+        .replaceAll('"', '\\"')
+        .replaceAll("`", "\\`")
+        .replaceAll("-", "\\-");
+};
+
 function generateColumnFormula(tableName, columnName) {
-    return "\"".concat(tableName, "\".\"").concat(columnName, "\"");
+    var preparedTableName = escapeSpecialCharacters(tableName);
+    var preparedColumnName = escapeSpecialCharacters(columnName);
+    return "\"".concat(preparedTableName, "\".\"").concat(preparedColumnName, "\"");
 }
 function fillTemplateString(templateString, params) {
     return templateString.replace(/\{(.*?)\}/g, function (_, key) { var _a; return (_a = params[key]) !== null && _a !== void 0 ? _a : ""; });
@@ -738,6 +749,7 @@ function mapMeasureToInput(measure, variables, addFormulas) {
     return {
         alias: String(measure.id),
         mainFormula: mainFormula,
+        dataType: measure.dataType,
         displayConditionFormula: getDisplayConditionFormula(measure.displayCondition),
         additionalFormulas: addFormulas(measure),
     };
@@ -760,6 +772,7 @@ function mapDimensionToInput(dimension, variables) {
     return {
         alias: String(dimension.id),
         formula: formula,
+        dataType: dimension.dataType,
         hideEmpty: dimension.hideEmptyValues,
         displayConditionFormula: getDisplayConditionFormula(dimension.displayCondition),
     };
@@ -783,6 +796,7 @@ function mapTransitionMeasureToInput(indicator, process, variables, addFormulas)
     return {
         alias: String(indicator.id),
         mainFormula: mainFormula,
+        dataType: indicator.dataType,
         displayConditionFormula: getDisplayConditionFormula(indicator.displayCondition),
         additionalFormulas: addFormulas(indicator),
     };
@@ -806,6 +820,7 @@ function mapEventMeasureToInput(indicator, process, variables, addFormulas) {
     return {
         alias: String(indicator.id),
         mainFormula: mainFormula,
+        dataType: indicator.dataType,
         displayConditionFormula: getDisplayConditionFormula(indicator.displayCondition),
         additionalFormulas: addFormulas(indicator),
     };
@@ -926,6 +941,8 @@ var EControlType;
     EControlType["eventsColor"] = "eventsColor";
     EControlType["inputMarkdown"] = "inputMarkdown";
     EControlType["filter"] = "filter";
+    EControlType["actionOnClick"] = "actionOnClick";
+    EControlType["eventsPicker"] = "eventsPicker";
 })(EControlType || (EControlType = {}));
 
 var ESortDirection;
@@ -1030,4 +1047,4 @@ var getLocalizedText = function (language, locObj, props) {
     return localization.getLocalized(locObj, props);
 };
 
-export { ECalculatorFilterMethods, EColorMode, EControlType, EDbType, EDimensionTemplateNames, EDisplayConditionMode, EDurationUnit, EEventMeasureTemplateNames, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMeasureTemplateNames, EProcessFilterNames, ESimpleDataType, ESortDirection, ESortingValueModes, ETransitionMeasureTemplateNames, EWidgetActionInputMode, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, dimensionTemplateFormulas, eventMeasureTemplateFormulas, fillTemplateString, formulaFilterMethods, generateColumnFormula, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getTransitionMeasureFormula, isActionValid, isHierarchy, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, mapVariablesToInputs, measureTemplateFormulas, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, transitionMeasureTemplateFormulas, updateDefaultModeSelection, updateMultiModeSelection, updateSingleModeSelection };
+export { ECalculatorFilterMethods, EColorMode, EControlType, EDbType, EDimensionTemplateNames, EDisplayConditionMode, EDurationUnit, EEventMeasureTemplateNames, EFormatTypes, EFormattingPresets, EFormulaFilterFieldKeys, EIndicatorType, ELastTimeUnit, EMeasureTemplateNames, EProcessFilterNames, ESimpleDataType, ESortDirection, ESortingValueModes, ETransitionMeasureTemplateNames, EWidgetActionInputMode, EWidgetFilterMode, EWidgetIndicatorType, EWidgetIndicatorValueModes, bindContentWithIndicator, bindContentsWithIndicators, checkDisplayCondition, dimensionTemplateFormulas, escapeSpecialCharacters, eventMeasureTemplateFormulas, fillTemplateString, formulaFilterMethods, generateColumnFormula, getDimensionFormula, getDisplayConditionFormula, getEventMeasureFormula, getLocalizedText, getMeasureFormula, getTransitionMeasureFormula, isActionValid, isHierarchy, mapDimensionsToInputs, mapEventMeasuresToInputs, mapFormulaFilterToCalculatorInput, mapFormulaFiltersToInputs, mapMeasuresToInputs, mapSortingToInputs, mapTransitionMeasuresToInputs, mapVariablesToInputs, measureTemplateFormulas, prepareValuesForSql, replaceDisplayCondition, replaceFiltersBySelection, replaceHierarchiesWithDimensions, selectDimensionFromHierarchy, transitionMeasureTemplateFormulas, updateDefaultModeSelection, updateMultiModeSelection, updateSingleModeSelection };

package/dist/index.js

@@ -74,22 +74,23 @@ exports.EWidgetActionInputMode = void 0;
 })(exports.EWidgetActionInputMode || (exports.EWidgetActionInputMode = {}));
 var isActionValid = function (action, _a) {
     var _b;
-    var scripts = _a.scripts, tables = _a.tables;
-    var currentScript = scripts.get((_b = action.scriptGuid) !== null && _b !== void 0 ? _b : "");
+    var scripts = _a.scripts, tables = _a.tables, variables = _a.variables;
+    var currentScript = scripts.get((_b = action.scriptName) !== null && _b !== void 0 ? _b : "");
     if (!currentScript) {
         return false;
     }
-    var actionInputsMap = new Map(action.inputs.map(function (input) { return [input.guid, input]; }));
-    if (actionInputsMap.size < currentScript.fieldsGuids.size) {
+    var actionInputsMap = new Map(action.inputs.map(function (input) { return [input.name, input]; }));
+    if (actionInputsMap.size < currentScript.fieldsNames.size) {
         return false;
     }
-    return __spreadArray([], __read(currentScript.fieldsGuids), false).every(function (guid) {
-        var actionInput = actionInputsMap.get(guid !== null && guid !== void 0 ? guid : "");
+    return __spreadArray([], __read(currentScript.fieldsNames), false).every(function (name) {
+        var actionInput = actionInputsMap.get(name !== null && name !== void 0 ? name : "");
         if (!actionInput) {
             return false;
         }
         var value = actionInput.value;
-        if (value.mode === exports.EWidgetActionInputMode.FROM_VARIABLE && !value.guid) {
+        if (value.mode === exports.EWidgetActionInputMode.FROM_VARIABLE &&
+            !variables.has(value.name)) {
             return false;
         }
         if (value.mode === exports.EWidgetActionInputMode.FORMULA && !value.formula) {
@@ -492,8 +493,8 @@ exports.EDisplayConditionMode = void 0;
 function checkDisplayCondition(displayCondition, variables) {
     var _a;
     if ((displayCondition === null || displayCondition === void 0 ? void 0 : displayCondition.mode) === exports.EDisplayConditionMode.VARIABLE) {
-        var variableGuid = displayCondition.variableGuid, variableValue = displayCondition.variableValue;
-        var currentVariableValue = variableGuid && ((_a = variables.get(variableGuid)) === null || _a === void 0 ? void 0 : _a.value);
+        var variableName = displayCondition.variableName, variableValue = displayCondition.variableValue;
+        var currentVariableValue = variableName && ((_a = variables.get(variableName)) === null || _a === void 0 ? void 0 : _a.value);
         var isCurrentVariableMatch = Array.isArray(currentVariableValue)
             ? !!variableValue && (currentVariableValue === null || currentVariableValue === void 0 ? void 0 : currentVariableValue.includes(variableValue))
             : currentVariableValue === variableValue;
@@ -514,8 +515,18 @@ var replaceDisplayCondition = function (dimension, displayCondition) {
         : __assign(__assign({}, dimension), { displayCondition: displayCondition });
 };
 
+var escapeSpecialCharacters = function (formula) {
+    return formula
+        .replaceAll("\\", "\\\\")
+        .replaceAll('"', '\\"')
+        .replaceAll("`", "\\`")
+        .replaceAll("-", "\\-");
+};
+
 function generateColumnFormula(tableName, columnName) {
-    return "\"".concat(tableName, "\".\"").concat(columnName, "\"");
+    var preparedTableName = escapeSpecialCharacters(tableName);
+    var preparedColumnName = escapeSpecialCharacters(columnName);
+    return "\"".concat(preparedTableName, "\".\"").concat(preparedColumnName, "\"");
 }
 function fillTemplateString(templateString, params) {
     return templateString.replace(/\{(.*?)\}/g, function (_, key) { var _a; return (_a = params[key]) !== null && _a !== void 0 ? _a : ""; });
@@ -739,6 +750,7 @@ function mapMeasureToInput(measure, variables, addFormulas) {
     return {
         alias: String(measure.id),
         mainFormula: mainFormula,
+        dataType: measure.dataType,
         displayConditionFormula: getDisplayConditionFormula(measure.displayCondition),
         additionalFormulas: addFormulas(measure),
     };
@@ -761,6 +773,7 @@ function mapDimensionToInput(dimension, variables) {
     return {
         alias: String(dimension.id),
         formula: formula,
+        dataType: dimension.dataType,
         hideEmpty: dimension.hideEmptyValues,
         displayConditionFormula: getDisplayConditionFormula(dimension.displayCondition),
     };
@@ -784,6 +797,7 @@ function mapTransitionMeasureToInput(indicator, process, variables, addFormulas)
     return {
         alias: String(indicator.id),
         mainFormula: mainFormula,
+        dataType: indicator.dataType,
         displayConditionFormula: getDisplayConditionFormula(indicator.displayCondition),
         additionalFormulas: addFormulas(indicator),
     };
@@ -807,6 +821,7 @@ function mapEventMeasureToInput(indicator, process, variables, addFormulas) {
     return {
         alias: String(indicator.id),
         mainFormula: mainFormula,
+        dataType: indicator.dataType,
         displayConditionFormula: getDisplayConditionFormula(indicator.displayCondition),
         additionalFormulas: addFormulas(indicator),
     };
@@ -927,6 +942,8 @@ exports.EControlType = void 0;
     EControlType["eventsColor"] = "eventsColor";
     EControlType["inputMarkdown"] = "inputMarkdown";
     EControlType["filter"] = "filter";
+    EControlType["actionOnClick"] = "actionOnClick";
+    EControlType["eventsPicker"] = "eventsPicker";
 })(exports.EControlType || (exports.EControlType = {}));
 
 exports.ESortDirection = void 0;
@@ -1043,6 +1060,7 @@ exports.bindContentWithIndicator = bindContentWithIndicator;
 exports.bindContentsWithIndicators = bindContentsWithIndicators;
 exports.checkDisplayCondition = checkDisplayCondition;
 exports.dimensionTemplateFormulas = dimensionTemplateFormulas;
+exports.escapeSpecialCharacters = escapeSpecialCharacters;
 exports.eventMeasureTemplateFormulas = eventMeasureTemplateFormulas;
 exports.fillTemplateString = fillTemplateString;
 exports.formulaFilterMethods = formulaFilterMethods;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infomaximum/widget-sdk",
-  "version": "4.0.0-beta1",
+  "version": "4.0.0-beta10",
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",