@adaptabletools/adaptable 17.0.0-canary.0 → 17.0.0-canary.2

package/src/Utilities/ExpressionFunctions/dateUtils.js

@@ -8,3 +8,12 @@ export const normalizeDateParams = (args) => {
     }
     return [first, second];
 };
+export const normalizeDateParam = (args) => {
+    if (typeof args === 'string') {
+        args = new Date(args);
+    }
+    if (typeof args === 'number') {
+        args = new Date(args);
+    }
+    return args;
+};

package/src/Utilities/ExpressionFunctions/deepMap.d.ts

@@ -1,10 +1,10 @@
-declare type VoidFn = () => void;
-declare type Pair<KeyType, ValueType> = {
+type VoidFn = () => void;
+type Pair<KeyType, ValueType> = {
     value?: ValueType;
     map?: Map<KeyType, Pair<KeyType, ValueType>>;
     revision?: number;
 };
-export declare type DeepMapVisitFn<KeyType, ValueType> = (pair: Pair<KeyType, ValueType>, keys: KeyType[], next: VoidFn) => void;
+export type DeepMapVisitFn<KeyType, ValueType> = (pair: Pair<KeyType, ValueType>, keys: KeyType[], next: VoidFn) => void;
 export declare class DeepMap<KeyType, ValueType> {
     private map;
     private length;

package/src/Utilities/ExpressionFunctions/deepMap.js

@@ -1,5 +1,12 @@
 const SORT_ASC_REVISION = (p1, p2) => sortAscending(p1.revision, p2.revision);
 export class DeepMap {
+    static clone(map) {
+        const clone = new DeepMap();
+        map.visit((pair, keys) => {
+            clone.set(keys, pair.value);
+        });
+        return clone;
+    }
     constructor(initial) {
         this.map = new Map();
         this.length = 0;
@@ -39,13 +46,6 @@ export class DeepMap {
             });
         }
     }
-    static clone(map) {
-        const clone = new DeepMap();
-        map.visit((pair, keys) => {
-            clone.set(keys, pair.value);
-        });
-        return clone;
-    }
     set(keys, value) {
         let currentMap = this.map;
         if (!keys.length) {

package/src/Utilities/ExpressionFunctions/expressionFunctionUtils.d.ts

@@ -16,7 +16,7 @@ export declare const isTextSearchCaseInsensitive: (context: ExpressionContext) =
 export declare const getDataChangeLog$: (context: ExpressionContext, columnNameFilter: string) => Observable<CellDataChangedInfo>;
 export declare const getGridChangeLog$: (context: ExpressionContext, gridChangeType: GridDataChangedInfo['rowTrigger']) => Observable<GridDataChangedInfo>;
 export declare const handleWhereFunction: (args: ExpressionNode[], context: ExpressionContext) => any;
-export declare type ExpressionNode = any;
+export type ExpressionNode = any;
 export declare const evaluateExpressionNode: (expressionNode: ExpressionNode, context: ExpressionContext, filterFn?: (item: any) => boolean) => any;
 export declare const extractColumnParameter: (consumingFunctionName: string, args: BaseParameter[]) => ColumnParameter;
 export declare const extractColumnParameters: (consumingFunctionName: string, args: BaseParameter[]) => ColumnParameter[];

package/src/Utilities/ExpressionFunctions/groupingMap.d.ts

@@ -1,15 +1,15 @@
 import { DeepMap } from './deepMap';
-export declare type GroupKeyType<T extends any = any> = T;
-export declare type GroupBy<DataType, KeyType> = {
+export type GroupKeyType<T extends any = any> = T;
+export type GroupBy<DataType, KeyType> = {
     field: keyof DataType;
     toKey?: (value: any, data: DataType) => GroupKeyType<KeyType>;
 };
-export declare type GroupParams<DataType, KeyType> = {
+export type GroupParams<DataType, KeyType> = {
     groupBy: GroupBy<DataType, KeyType>[];
     defaultToKey?: (value: any, item: DataType) => GroupKeyType<KeyType>;
     reducers?: Record<string, DataSourceAggregationReducer<DataType, any>>;
 };
-export declare type DataSourceAggregationReducer<T, AggregationResultType> = {
+export type DataSourceAggregationReducer<T, AggregationResultType> = {
     name?: string;
     field?: keyof T;
     initialValue?: AggregationResultType;
@@ -17,18 +17,18 @@ export declare type DataSourceAggregationReducer<T, AggregationResultType> = {
     reducer: string | ((accumulator: any, value: any, data: T) => AggregationResultType | any);
     done?: (accumulatedValue: AggregationResultType | any, array: T[]) => AggregationResultType;
 };
-export declare type DataGroupResult<DataType, KeyType extends any> = {
+export type DataGroupResult<DataType, KeyType extends any> = {
     deepMap: DeepMap<GroupKeyType<KeyType>, DeepMapGroupValueType<DataType, KeyType>>;
     groupParams: GroupParams<DataType, KeyType>;
     initialData: DataType[];
     reducerResults?: Record<string, any>;
 };
-export declare type DeepMapGroupValueType<DataType, KeyType> = {
+export type DeepMapGroupValueType<DataType, KeyType> = {
     items: DataType[];
     commonData?: Partial<DataType>;
     reducerResults: Record<string, any>;
 };
-export declare type AggregationReducerResult<AggregationResultType extends any = any> = {
+export type AggregationReducerResult<AggregationResultType extends any = any> = {
     value: AggregationResultType;
     id: string;
 };

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.d.ts

@@ -2,6 +2,6 @@ import { ExpressionFunction } from '../../parser/src/types';
 /**
  * List of all the Observable Functions available in AdaptableQL
  */
-export declare type ObservableFunctionName = 'WHERE' | 'COL' | 'TIMEFRAME' | 'ROW_CHANGE' | 'ROW_ADDED' | 'GRID_CHANGE' | 'ROW_REMOVED' | 'MAX' | 'MIN' | 'NONE' | 'COUNT';
+export type ObservableFunctionName = 'WHERE' | 'COL' | 'TIMEFRAME' | 'ROW_CHANGE' | 'ROW_ADDED' | 'GRID_CHANGE' | 'ROW_REMOVED' | 'MAX' | 'MIN' | 'NONE' | 'COUNT';
 export declare const observableExpressionFunctions: Record<ObservableFunctionName, ExpressionFunction>;
 export declare const observableExpressionFunctionNames: ObservableFunctionName[];

package/src/Utilities/ExpressionFunctions/scalarAggregationHelper.d.ts

@@ -1,15 +1,15 @@
 import { DeepMap } from './deepMap';
-export declare type GroupKeyType<T extends any = any> = T;
-export declare type GroupBy<DataType, KeyType> = {
+export type GroupKeyType<T extends any = any> = T;
+export type GroupBy<DataType, KeyType> = {
     field: keyof DataType & string;
     toKey?: (value: any, data: DataType) => GroupKeyType<KeyType>;
 };
-export declare type AggregateParams<DataType, KeyType> = {
+export type AggregateParams<DataType, KeyType> = {
     reducers: Record<string, DataAggregationReducer<DataType, any>>;
     groupBy?: GroupBy<DataType, KeyType>[];
     defaultToKey?: (value: any, item: DataType) => GroupKeyType<KeyType>;
 };
-export declare type DataAggregationReducer<T, AggregationResultType> = {
+export type DataAggregationReducer<T, AggregationResultType> = {
     name?: string;
     field?: keyof T & string;
     initialValue?: AggregationResultType;
@@ -17,16 +17,16 @@ export declare type DataAggregationReducer<T, AggregationResultType> = {
     reducer: string | ((accumulator: any, value: any, data: T, dataIndex: number) => AggregationResultType | any);
     done?: (accumulatedValue: AggregationResultType | any, array: T[]) => AggregationResultType;
 };
-export declare type DataAggregationResult<DataType, KeyType extends any> = {
+export type DataAggregationResult<DataType, KeyType extends any> = {
     deepMap: DeepMap<GroupKeyType<KeyType>, DeepMapAggregationValueType<DataType, KeyType>>;
     aggregateParams: AggregateParams<DataType, KeyType>;
     initialData: DataType[];
     reducerResults?: Record<string, AggregationReducerResult>;
 };
-export declare type DeepMapAggregationValueType<DataType, KeyType> = {
+export type DeepMapAggregationValueType<DataType, KeyType> = {
     items: DataType[];
     commonData?: Partial<DataType>;
     reducerResults: Record<string, AggregationReducerResult>;
 };
-export declare type AggregationReducerResult = number;
+export type AggregationReducerResult = number;
 export declare function aggregate<DataType, KeyType = any>(aggregateParams: AggregateParams<DataType, KeyType>, data: DataType[]): DataAggregationResult<DataType, KeyType>;

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.d.ts

@@ -2,6 +2,6 @@ import { ExpressionFunction } from '../../parser/src/types';
 /**
  * List of all the Scalar Functions available in AdaptableQL
  */
-export declare type ScalarFunctionName = 'ADD' | 'SUB' | 'MUL' | 'DIV' | 'MOD' | 'POW' | 'ABS' | 'CEILING' | 'FLOOR' | 'ROUND' | 'MIN' | 'MAX' | 'AVG' | 'DATE' | 'NOW' | 'TODAY' | 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | 'ADD_DAYS' | 'ADD_WEEKS' | 'ADD_MONTHS' | 'ADD_YEARS' | 'DIFF_DAYS' | 'DIFF_WEEKS' | 'DIFF_MONTHS' | 'DIFF_YEARS' | 'SUB_STRING' | 'REPLACE' | 'COALESCE' | 'NULL' | 'LEN' | 'UPPER' | 'LOWER' | 'CONCAT' | 'IF' | 'CASE' | 'COL' | 'VAR' | 'TO_ARRAY' | 'QUERY' | 'IS_BLANK';
+export type ScalarFunctionName = 'ADD' | 'SUB' | 'MUL' | 'DIV' | 'MOD' | 'POW' | 'ABS' | 'CEILING' | 'FLOOR' | 'ROUND' | 'MIN' | 'MAX' | 'AVG' | 'DATE' | 'NOW' | 'TODAY' | 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | 'ADD_DAYS' | 'ADD_WEEKS' | 'ADD_MONTHS' | 'ADD_YEARS' | 'DIFF_DAYS' | 'DIFF_WEEKS' | 'DIFF_MONTHS' | 'DIFF_YEARS' | 'SUB_STRING' | 'REPLACE' | 'COALESCE' | 'NULL' | 'LEN' | 'UPPER' | 'LOWER' | 'CONCAT' | 'IF' | 'CASE' | 'COL' | 'VAR' | 'TO_ARRAY' | 'QUERY' | 'IS_BLANK' | 'IS_NOT_BLANK';
 export declare const scalarExpressionFunctions: Record<ScalarFunctionName, ExpressionFunction>;
 export declare const scalarExpressionFunctionNames: ScalarFunctionName[];

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -140,11 +140,21 @@ export const scalarExpressionFunctions = {
             return args[0] === undefined || args[0] === null || args[0] === '';
         },
         category: 'special',
-        description: 'Returns true is input value is undefined, null or an empty string',
+        description: 'Returns true if input value is undefined, null, or an empty string',
         signatures: ['IS_BLANK(input: any)'],
         examples: ['IS_BLANK([col1])'],
         returnType: 'boolean',
     },
+    IS_NOT_BLANK: {
+        handler(args) {
+            return args[0] !== undefined && args[0] !== null && (String)(args[0]).trim() !== '';
+        },
+        category: 'special',
+        description: 'Returns true if input value is not empty',
+        signatures: ['IS_NOT_BLANK(input: any)'],
+        examples: ['IS_NOT_BLANK([col1])'],
+        returnType: 'boolean',
+    },
     ABS: {
         handler(args) {
             return sanitizeNumericResult(Math.abs(args[0]));

package/src/Utilities/Extensions/TypeExtensions.d.ts

@@ -1,7 +1,7 @@
 /**
  * Get the keys of FirstType without any keys of SecondType.
  */
-declare type Without<FirstType, SecondType> = {
+type Without<FirstType, SecondType> = {
     [KeyType in Exclude<keyof FirstType, keyof SecondType>]?: never;
 };
 /**
@@ -13,7 +13,7 @@ declare type Without<FirstType, SecondType> = {
  *
  * @see https://github.com/maninak/ts-xor/tree/master#description
  */
-export declare type XOR<FirstType, SecondType> = FirstType | SecondType extends object ? (Without<FirstType, SecondType> & SecondType) | (Without<SecondType, FirstType> & FirstType) : FirstType | SecondType;
+export type XOR<FirstType, SecondType> = FirstType | SecondType extends object ? (Without<FirstType, SecondType> & SecondType) | (Without<SecondType, FirstType> & FirstType) : FirstType | SecondType;
 /**
  * Create a type where at least one of the properties of a type(can be any property) is required to exist.
  * Optionally the set of required properties may be restricted with the second generic type.
@@ -38,11 +38,11 @@ export declare type XOR<FirstType, SecondType> = FirstType | SecondType extends
  *
  * @see https://stackoverflow.com/a/49725198
  */
-export declare type RequireAtLeastOne<T, Keys extends keyof T = keyof T> = Pick<T, Exclude<keyof T, Keys>> & {
+export type RequireAtLeastOne<T, Keys extends keyof T = keyof T> = Pick<T, Exclude<keyof T, Keys>> & {
     [K in Keys]-?: Required<Pick<T, K>> & Partial<Pick<T, Exclude<Keys, K>>>;
 }[Keys];
 /** Similar to the builtin Extract, but checks the filter strictly */
-export declare type StrictExtract<T, U extends Partial<T>> = Extract<T, U>;
+export type StrictExtract<T, U extends Partial<T>> = Extract<T, U>;
 /**
  * DeepRequired
  *
@@ -66,13 +66,13 @@ export declare type StrictExtract<T, U extends Partial<T>> = Extract<T, U>;
  *   };
  *   type RequiredNestedProps = DeepRequired<NestedProps>;
  */
-export declare type DeepRequired<T> = T extends (...args: any[]) => any ? T : T extends any[] ? _DeepRequiredArray<T[number]> : T extends object ? _DeepRequiredObject<T> : T;
+export type DeepRequired<T> = T extends (...args: any[]) => any ? T : T extends any[] ? _DeepRequiredArray<T[number]> : T extends object ? _DeepRequiredObject<T> : T;
 export interface _DeepRequiredArray<T> extends Array<DeepRequired<NonUndefined<T>>> {
 }
-export declare type _DeepRequiredObject<T> = {
+export type _DeepRequiredObject<T> = {
     [P in keyof T]-?: DeepRequired<NonUndefined<T[P]>>;
 };
-export declare type NonUndefined<A> = A extends undefined ? never : A;
+export type NonUndefined<A> = A extends undefined ? never : A;
 export declare const getTypedKeys: <T extends string>(input: Record<T, any>) => T[];
-export declare type OneOf<T extends any[]> = T extends [infer Only] ? Only : T extends [infer A, infer B, ...infer Rest] ? OneOf<[XOR<A, B>, ...Rest]> : never;
+export type OneOf<T extends any[]> = T extends [infer Only] ? Only : T extends [infer A, infer B, ...infer Rest] ? OneOf<[XOR<A, B>, ...Rest]> : never;
 export {};

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -31,6 +31,10 @@ export function assignAdaptableOptions(adaptableOptions) {
     returnedAdaptableOptions.groupingOptions = Object.assign({}, DefaultAdaptableOptions.groupingOptions, adaptableOptions.groupingOptions);
     returnedAdaptableOptions.quickSearchOptions = Object.assign({}, DefaultAdaptableOptions.quickSearchOptions, adaptableOptions.quickSearchOptions);
     returnedAdaptableOptions.columnFilterOptions = Object.assign({}, DefaultAdaptableOptions.columnFilterOptions, adaptableOptions.columnFilterOptions);
+    returnedAdaptableOptions.columnFilterOptions.quickFilterOptions = Object.assign({}, DefaultAdaptableOptions.columnFilterOptions.quickFilterOptions, returnedAdaptableOptions.columnFilterOptions.quickFilterOptions);
+    returnedAdaptableOptions.columnFilterOptions.filterFormOptions = Object.assign({}, DefaultAdaptableOptions.columnFilterOptions.filterFormOptions, returnedAdaptableOptions.columnFilterOptions.filterFormOptions);
+    returnedAdaptableOptions.columnFilterOptions.valuesFilterOptions = Object.assign({}, DefaultAdaptableOptions.columnFilterOptions.valuesFilterOptions, returnedAdaptableOptions.columnFilterOptions.valuesFilterOptions);
+    returnedAdaptableOptions.gridFilterOptions = Object.assign({}, DefaultAdaptableOptions.gridFilterOptions, adaptableOptions.gridFilterOptions);
     returnedAdaptableOptions.userInterfaceOptions = Object.assign({}, DefaultAdaptableOptions.userInterfaceOptions, adaptableOptions.userInterfaceOptions);
     returnedAdaptableOptions.userInterfaceOptions.dateInputOptions = Object.assign({}, DefaultAdaptableOptions.userInterfaceOptions.dateInputOptions, returnedAdaptableOptions.userInterfaceOptions.dateInputOptions);
     returnedAdaptableOptions.menuOptions = Object.assign({}, DefaultAdaptableOptions.menuOptions, adaptableOptions.menuOptions);

package/src/Utilities/ObjectFactory.js

@@ -89,7 +89,7 @@ export function CreateEmptyFlashingCellDefinition() {
         Rule: {
             Predicates: [
                 {
-                    PredicateId: 'Any',
+                    PredicateId: 'AnyChange',
                 },
             ],
         },

package/src/Utilities/Services/EntitlementService.d.ts

@@ -10,6 +10,5 @@ export declare class EntitlementService implements IEntitlementService {
     isModuleFullEntitlement(adaptableModule: AdaptableModule): boolean;
     isModuleReadOnlyEntitlement(adaptableModule: AdaptableModule): boolean;
     getEntitlementAccessLevelForModule(adaptableModule: AdaptableModule): AccessLevel;
-    isGridInfoSectionVisible(section: 'GridSummary' | 'AdaptableOptions' | 'ColumnInfo'): boolean;
     destroy(): void;
 }

package/src/Utilities/Services/EntitlementService.js

@@ -57,14 +57,6 @@ export class EntitlementService {
         }
         return 'Full';
     }
-    isGridInfoSectionVisible(section) {
-        if (this.isModuleHiddenEntitlement('GridInfo')) {
-            return false;
-        }
-        return this.adaptableApi.optionsApi
-            .getUserInterfaceOptions()
-            .gridInfoSections.includes(section);
-    }
     destroy() {
         // TO DO
     }

package/src/Utilities/Services/Interface/IAlertService.d.ts

@@ -2,13 +2,13 @@ import { AlertDefinition } from '../../../PredefinedConfig/AlertState';
 import { CellDataChangedInfo } from '../../../PredefinedConfig/Common/CellDataChangedInfo';
 import { GridDataChangedInfo } from '../../../types';
 import { IAdaptableService } from './IAdaptableService';
-export declare type ReactiveAlertInfo = ReactiveGridDataChangedAlertInfo | ReactiveCellDataChangedAlertInfo;
-export declare type ReactiveGridDataChangedAlertInfo = {
+export type ReactiveAlertInfo = ReactiveGridDataChangedAlertInfo | ReactiveCellDataChangedAlertInfo;
+export type ReactiveGridDataChangedAlertInfo = {
     type: 'gridDataChangedAlert';
     alertDefinition: AlertDefinition;
     gridChangeLogEntry: GridDataChangedInfo;
 };
-export declare type ReactiveCellDataChangedAlertInfo = {
+export type ReactiveCellDataChangedAlertInfo = {
     type: 'cellDataChangedAlert';
     alertDefinition: AlertDefinition;
     cellChangeLogEntry: CellDataChangedInfo;

package/src/Utilities/Services/Interface/IEntitlementService.d.ts

@@ -1,16 +1,10 @@
 import { IAdaptableService } from './IAdaptableService';
 import { AdaptableModule } from '../../../PredefinedConfig/Common/Types';
 import { AccessLevel } from '../../../PredefinedConfig/Common/Entitlement';
-import { GridInfoSection } from '../../../types';
 export interface IEntitlementService extends IAdaptableService {
     setModulesEntitlements(): void;
     isModuleHiddenEntitlement(adaptableModule: AdaptableModule): boolean;
     isModuleFullEntitlement(adaptableModule: AdaptableModule): boolean;
     isModuleReadOnlyEntitlement(adaptableModule: AdaptableModule): boolean;
     getEntitlementAccessLevelForModule(adaptableModule: AdaptableModule): AccessLevel;
-    /**
-     * No longer used
-     * @deprecated
-     */
-    isGridInfoSectionVisible(section: GridInfoSection): boolean;
 }

package/src/Utilities/Services/Interface/IMetamodelService.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableOptions } from '../../../../types';
 import { MetamodelItemPropertyKind } from '../../../metamodel/adaptable-metamodel-model';
 import { IAdaptableService } from './IAdaptableService';
-export declare type GridInfoOptions = Map<string, {
+export type GridInfoOptions = Map<string, {
     containerLabel: string;
     items: GridInfoOption[];
 }>;

package/src/Utilities/Services/LicenseService/index.js

@@ -1 +1,181 @@
-import{SystemLicenseDisablePersistence as e,SystemLicenseShowWatermark as a}from"../../../Redux/ActionsReducers/SystemRedux";import{PopupShowAlert as t}from"../../../Redux/ActionsReducers/PopupRedux";import o from"../../ObjectFactory";import s from"lodash/clamp";import{LicenseDocsLink as i}from"../../Constants/DocumentationLinkConstants";import{decode as n,GENERIC_APP_NAME as r}from"../../license/decode";import{shouldLogThankYouMessage as l}from"./shouldLogThankYouMessage";const c="sales@adaptabletools.com",d=10,p=864e5;export var LicenseValidityType;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(LicenseValidityType||(LicenseValidityType={}));const E=/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g,I=/(https):\/\/\S+(\.csb\.app)/g,h=/(https):\/\/\S+(\.adaptabletools\.com)/g,_="undefined"!=typeof window?window.location.origin:"",O=()=>{const[e,a,t]=Array.from(E.exec(_)||[]);return"https"===a&&"sandpack.codesandbox.io"===t},A=()=>{const[e,a,t]=Array.from(I.exec(_)||[]);return"https"===a&&".csb.app"===t},L=()=>{const[e,a,t]=Array.from(h.exec(_)||[]);return"https"===a&&".adaptabletools.com"===t};export class LicenseService{constructor(e,a,t){this.adaptable=e,this.adaptable=e;let o=null;if(a)try{o=n(a)}catch(e){o=e}O()||A()||L()||this.handleLicenseValidation(o,this.getValidityType(o,t))}getValidityType(e,a){if(!e)return LicenseValidityType.NO_LICENSE;if(e instanceof Error)return LicenseValidityType.INVALID_LICENSE;const t=new Date(a.publishedAt),o=new Date(e.end),s=o<new Date,i=e.trial;let n=null;return n=s?o>t?i?LicenseValidityType.NON_PRODUCTION_EXPIRED_IN_SCOPE:LicenseValidityType.COMMERCIAL_EXPIRED_IN_SCOPE:i?LicenseValidityType.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:LicenseValidityType.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:i?LicenseValidityType.NON_PRODUCTION_VALID:LicenseValidityType.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){var t;const o=new Date;o.setHours(0,0,0,0);let n=0;e instanceof Error||!(null==e?void 0:e.end)||(n=Math.floor(((null===(t=null==e?void 0:e.end)||void 0===t?void 0:t.getTime())-o.getTime())/p),n=s(n,0,1/0));let E="",I="";!e||e instanceof Error||!e.appName||e.appName==r||(E=e.appName,I=" for application [APP_NAME]");const h=(e,a=i,t=c,o=n,s=E)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",s).replace("[DAYS]",`${o}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(h("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":this.adaptable.logger.consoleLogByMessageType(h("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":this.adaptable.logger.consoleLogByMessageType(h("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(h("This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Warning"),this.showWatermark("AdapTable License has expired");break;case"COMMERCIAL_VALID":if(n<=d)this.adaptable.logger.consoleLogByMessageType(h(`This AdapTable license${I} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{l()&&this.adaptable.logger.consoleLogByMessageType(h(`Thank you for using a valid AdapTable license${I}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(h(`This AdapTable license${I} has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)`),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(h(`This AdapTable license${I} has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license.`),"Error"),this.showNotification("Adaptable License has expired"),this.showWatermark("Adaptable License has expired")}}showNotification(e){this.adaptable.api.internalApi.dispatchReduxAction(t({alertType:"generic",header:"License Error",message:e,alertDefinition:o.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction(a(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction(e())}destroy(){}}
+import { SystemLicenseDisablePersistence, SystemLicenseShowWatermark, } from '../../../Redux/ActionsReducers/SystemRedux';
+import { PopupShowAlert } from '../../../Redux/ActionsReducers/PopupRedux';
+import ObjectFactory from '../../ObjectFactory';
+import clamp from 'lodash/clamp';
+import { LicenseDocsLink } from '../../Constants/DocumentationLinkConstants';
+import { decode as decodeLicense, GENERIC_APP_NAME } from '../../license/decode';
+import { shouldLogThankYouMessage } from './shouldLogThankYouMessage';
+const EMAIL = 'sales@adaptabletools.com';
+const COMMERCIAL_LICENSE_SHOW_INFO_DAYS_BEFORE_EXPIRE = 10;
+const DAY_IN_MS = 1000 * 60 * 60 * 24;
+export var LicenseValidityType;
+(function (LicenseValidityType) {
+    LicenseValidityType["INVALID_LICENSE"] = "INVALID_LICENSE";
+    LicenseValidityType["NO_LICENSE"] = "NO_LICENSE";
+    LicenseValidityType["NON_PRODUCTION_VALID"] = "NON_PRODUCTION_VALID";
+    LicenseValidityType["NON_PRODUCTION_EXPIRED_IN_SCOPE"] = "NON_PRODUCTION_EXPIRED_IN_SCOPE";
+    LicenseValidityType["NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE"] = "NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE";
+    LicenseValidityType["COMMERCIAL_VALID"] = "COMMERCIAL_VALID";
+    LicenseValidityType["COMMERCIAL_EXPIRED_IN_SCOPE"] = "COMMERCIAL_EXPIRED_IN_SCOPE";
+    LicenseValidityType["COMMERCIAL_EXPIRED_OUT_OF_SCOPE"] = "COMMERCIAL_EXPIRED_OUT_OF_SCOPE";
+})(LicenseValidityType || (LicenseValidityType = {}));
+const SANDPACK_REGEX = /(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g;
+const SANDBOX_REGEX = /(https):\/\/\S+(\.csb\.app)/g;
+const DEMO_REGEX = /(https):\/\/\S+(\.adaptabletools\.com)/g;
+const origin = typeof window !== 'undefined' ? window.location.origin : '';
+const isInsideSandpack = () => {
+    const [_fullUrl, protocol, sandpackUrl] = Array.from(SANDPACK_REGEX.exec(origin) || []);
+    return protocol === 'https' && sandpackUrl === 'sandpack.codesandbox.io';
+};
+const isInsideSandbox = () => {
+    const [_fullUrl, protocol, sandboxUrl] = Array.from(SANDBOX_REGEX.exec(origin) || []);
+    return protocol === 'https' && sandboxUrl === '.csb.app';
+};
+const isDemoApp = () => {
+    const [_fullUrl, protocol, demoAppUrl] = Array.from(DEMO_REGEX.exec(origin) || []);
+    return protocol === 'https' && demoAppUrl === '.adaptabletools.com';
+};
+export class LicenseService {
+    constructor(adaptable, licenseKey, packageDetails) {
+        this.adaptable = adaptable;
+        this.adaptable = adaptable;
+        let details = null;
+        if (licenseKey) {
+            try {
+                details = decodeLicense(licenseKey);
+            }
+            catch (error) {
+                details = error;
+            }
+        }
+        if (!isInsideSandpack() && !isInsideSandbox() && !isDemoApp()) {
+            this.handleLicenseValidation(details, this.getValidityType(details, packageDetails));
+        }
+    }
+    getValidityType(details, packageDetails) {
+        if (!details) {
+            return LicenseValidityType.NO_LICENSE;
+        }
+        if (details instanceof Error) {
+            return LicenseValidityType.INVALID_LICENSE;
+        }
+        const currentVersionReleaseDate = new Date(packageDetails.publishedAt);
+        const licenseEndDate = new Date(details.end);
+        const currentDate = new Date();
+        const isExpired = licenseEndDate < currentDate;
+        const isTrial = details.trial;
+        const isScope = licenseEndDate > currentVersionReleaseDate;
+        let validityType = null;
+        if (isExpired) {
+            if (isScope) {
+                if (isTrial) {
+                    validityType = LicenseValidityType.NON_PRODUCTION_EXPIRED_IN_SCOPE;
+                }
+                else {
+                    validityType = LicenseValidityType.COMMERCIAL_EXPIRED_IN_SCOPE;
+                }
+            }
+            else {
+                if (isTrial) {
+                    validityType = LicenseValidityType.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE;
+                }
+                else {
+                    validityType = LicenseValidityType.COMMERCIAL_EXPIRED_OUT_OF_SCOPE;
+                }
+            }
+        }
+        else {
+            if (isTrial) {
+                validityType = LicenseValidityType.NON_PRODUCTION_VALID;
+            }
+            else {
+                validityType = LicenseValidityType.COMMERCIAL_VALID;
+            }
+        }
+        return validityType;
+    }
+    handleLicenseValidation(details, validityType) {
+        var _a;
+        const nowAtMidnight = new Date();
+        nowAtMidnight.setHours(0, 0, 0, 0);
+        let daysLeft = 0;
+        if (!(details instanceof Error) && (details === null || details === void 0 ? void 0 : details.end)) {
+            daysLeft = Math.floor((((_a = details === null || details === void 0 ? void 0 : details.end) === null || _a === void 0 ? void 0 : _a.getTime()) - nowAtMidnight.getTime()) / DAY_IN_MS);
+            daysLeft = clamp(daysLeft, 0, Infinity);
+        }
+        let APP_NAME = '';
+        let forApp = '';
+        if (details &&
+            !(details instanceof Error) &&
+            details.appName &&
+            details.appName != GENERIC_APP_NAME) {
+            APP_NAME = details.appName;
+            forApp = ` for application [APP_NAME]`;
+        }
+        const annotateMessage = (message, link = LicenseDocsLink, email = EMAIL, days = daysLeft, appName = APP_NAME) => {
+            return message
+                .replace('[LINK]', link)
+                .replace('[EMAIL]', email)
+                .replace('[APP_NAME]', appName)
+                .replace('[DAYS]', `${days}`);
+        };
+        switch (validityType) {
+            case 'NO_LICENSE':
+            case 'NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE':
+                this.adaptable.logger.consoleLogByMessageType(annotateMessage('This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK].'), 'Error');
+                this.showNotification('No AdapTable License found.');
+                this.showWatermark('This instance of AdapTable does not have a license, and some functionality has therefore been removed.');
+                this.disableStatePersistence();
+                break;
+            case 'INVALID_LICENSE':
+                this.adaptable.logger.consoleLogByMessageType(annotateMessage('This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK].'), 'Error');
+                this.showNotification('Corrupted AdapTable License found.');
+                this.showWatermark(`This instance of AdapTable has a corrupted License, and some functionality has therefore been removed.`);
+                this.disableStatePersistence();
+                break;
+            case 'NON_PRODUCTION_VALID':
+                this.adaptable.logger.consoleLogByMessageType(annotateMessage('This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK].'), 'Info');
+                break;
+            case 'NON_PRODUCTION_EXPIRED_IN_SCOPE':
+                this.adaptable.logger.consoleLogByMessageType(annotateMessage('This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK].'), 'Warning');
+                this.showWatermark('AdapTable License has expired');
+                break;
+            case 'COMMERCIAL_VALID':
+                if (daysLeft <= COMMERCIAL_LICENSE_SHOW_INFO_DAYS_BEFORE_EXPIRE) {
+                    this.adaptable.logger.consoleLogByMessageType(annotateMessage(`This AdapTable license${forApp} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`), 'Info');
+                }
+                else {
+                    try {
+                        if (shouldLogThankYouMessage()) {
+                            this.adaptable.logger.consoleLogByMessageType(annotateMessage(`Thank you for using a valid AdapTable license${forApp}. Your license will expire in [DAYS] days.`), 'Info');
+                        }
+                    }
+                    catch (ex) { }
+                }
+                break;
+            case 'COMMERCIAL_EXPIRED_IN_SCOPE':
+                this.adaptable.logger.consoleLogByMessageType(annotateMessage(`This AdapTable license${forApp} has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)`), 'Warning');
+                break;
+            case 'COMMERCIAL_EXPIRED_OUT_OF_SCOPE':
+                this.adaptable.logger.consoleLogByMessageType(annotateMessage(`This AdapTable license${forApp} has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license.`), 'Error');
+                this.showNotification('Adaptable License has expired');
+                this.showWatermark('Adaptable License has expired');
+                break;
+        }
+    }
+    showNotification(text) {
+        this.adaptable.api.internalApi.dispatchReduxAction(PopupShowAlert({
+            alertType: 'generic',
+            header: 'License Error',
+            message: text,
+            alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
+        }));
+    }
+    showWatermark(text) {
+        this.adaptable.api.internalApi.dispatchReduxAction(SystemLicenseShowWatermark(text));
+    }
+    disableStatePersistence() {
+        this.adaptable.api.internalApi.dispatchReduxAction(SystemLicenseDisablePersistence());
+    }
+    destroy() { }
+}

package/src/Utilities/Services/MetamodelService.js

@@ -46,7 +46,7 @@ export class MetamodelService {
         Object.entries(optionsObject).forEach(([optionKey, optionValue]) => {
             var _a;
             if (optionKey === 'gridOptions') {
-                validationErrors.push('gridOptions was removed from AdapTable Options in Version 16 and is no longer used');
+                validationErrors.push('gridOptions was removed from Adaptable Options in Version 16 and is no longer used');
                 return;
             }
             if (optionKey === '_gridOptions' || optionKey === 'fdc3Options') {

package/src/Utilities/Services/ModuleService.js

@@ -116,7 +116,7 @@ export class ModuleService {
             case 'PlusMinus':
                 return learnUrl + 'handbook-editing-plus-minus';
             case 'NamedQuery':
-                return learnUrl + 'handbook-grid-filter';
+                return learnUrl + 'handbook-named-queries';
             case 'QuickSearch':
                 return learnUrl + 'handbook-quick-search';
             case 'Schedule':

package/src/Utilities/license/LicenseDetails.d.ts

@@ -1,4 +1,4 @@
-export declare type LicenseDetails = {
+export type LicenseDetails = {
     start: Date;
     end: Date;
     owner: string;

package/src/Utilities/license/decode.js

@@ -1 +1,65 @@
-import{compute_string as e}from"./hashing";const t=()=>new Error("Invalid License");export const GENERIC_APP_NAME="GenericAdaptableApp";export const fieldsToLicenseDetails=e=>{var a;const r=e.reduce(((e,t)=>(e.set(t.name,t.value),e)),new Map),n={start:new Date(r.get("StartDate")),end:new Date(r.get("EndDate")),owner:r.get("Owner"),appName:r.get("AppName")||GENERIC_APP_NAME,timestamp:r.get("TS")?Number(r.get("TS")):0,trial:"true"===r.get("Trial"),ref:null!==(a=r.get("Ref"))&&void 0!==a?a:""};if(!(n.start&&n.end&&n.owner&&"boolean"==typeof n.trial&&n.ref))throw t();return n};export const decode=a=>{let r="",n=a.split("|").map((e=>{let[t,a]=e.split("=");return"C"===t&&(r=a),{name:t,value:a}}));if(!r)throw t();const o=r.split(",").reverse(),s=o.pop();o.forEach(((a,r)=>{const o=n[r];if(e(o.value)!==a)throw t()}));const i=[...n];i.pop();const p=i.map((e=>`${e.name}=${e.value}`)).join("|");if(e(p)!==s)throw t();return n=n.map((e=>Object.assign(Object.assign({},e),{value:decodeURI(e.value)}))),fieldsToLicenseDetails(n)};
+import { compute_string } from './hashing';
+const getGenericError = () => new Error('Invalid License');
+export const GENERIC_APP_NAME = 'GenericAdaptableApp';
+export const fieldsToLicenseDetails = (fields) => {
+    var _a;
+    const fieldsMap = fields.reduce((acc, field) => {
+        acc.set(field.name, field.value);
+        return acc;
+    }, new Map());
+    const details = {
+        start: new Date(fieldsMap.get('StartDate')),
+        end: new Date(fieldsMap.get('EndDate')),
+        owner: fieldsMap.get('Owner'),
+        appName: fieldsMap.get('AppName') || GENERIC_APP_NAME,
+        timestamp: fieldsMap.get('TS') ? Number(fieldsMap.get('TS')) : 0,
+        trial: fieldsMap.get('Trial') === 'true' ? true : false,
+        ref: (_a = fieldsMap.get('Ref')) !== null && _a !== void 0 ? _a : '',
+    };
+    if (!details.start ||
+        !details.end ||
+        !details.owner ||
+        typeof details.trial !== 'boolean' ||
+        !details.ref) {
+        throw getGenericError();
+    }
+    return details;
+};
+export const decode = (licenseKey) => {
+    let crc = '';
+    let fields = licenseKey.split('|').map((part) => {
+        let [name, value] = part.split('=');
+        if (name === 'C') {
+            crc = value;
+        }
+        return {
+            name,
+            value,
+        };
+    });
+    if (!crc) {
+        throw getGenericError();
+    }
+    const crcParts = crc.split(',').reverse();
+    const overallCrc = crcParts.pop();
+    crcParts.forEach((fieldCrc, index) => {
+        const field = fields[index];
+        if (compute_string(field.value) !== fieldCrc) {
+            throw getGenericError();
+        }
+    });
+    const fieldsWithoutC = [...fields];
+    fieldsWithoutC.pop();
+    const fieldsWithoutCString = fieldsWithoutC
+        .map((field) => {
+        return `${field.name}=${field.value}`;
+    })
+        .join('|');
+    if (compute_string(fieldsWithoutCString) !== overallCrc) {
+        throw getGenericError();
+    }
+    fields = fields.map((f) => {
+        return Object.assign(Object.assign({}, f), { value: decodeURI(f.value) });
+    });
+    return fieldsToLicenseDetails(fields);
+};