@adaptabletools/adaptable 12.0.0-canary.4 → 12.0.0-canary.7

package/src/Utilities/Helpers/DateHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseDateValue = exports.parseToISO = exports.dateToISO = exports.isValueValidDate = exports.isValidDate = void 0;
+exports.parseFilterValueDate = exports.parseFilterInputDate = exports.utcDateToSameDateInLocale = exports.parseDateValue = exports.parseToISO = exports.dateToISO = exports.isValueValidDate = exports.isValidDate = void 0;
 const tslib_1 = require("tslib");
 const parseISO_1 = tslib_1.__importDefault(require("date-fns/parseISO"));
 const parse_1 = tslib_1.__importDefault(require("date-fns/parse"));
@@ -63,3 +63,35 @@ const parseDateValue = (dateValue, dateFormat) => {
     return dateInstance;
 };
 exports.parseDateValue = parseDateValue;
+/**
+ * Creates a date with the same day/month/year/hour with the current timezone.
+ * '2022-06-01T17:00:00.000Z' => '2022-06-01T17:00:00.000+03:00' // RO time
+ *
+ * new Date() always creates the date using the current timezone.
+ * To compare two dates, they need to be in the same timezone.
+ *
+ * @param date Date
+ */
+const utcDateToSameDateInLocale = (date) => {
+    return new Date(date.getTime() + date.getTimezoneOffset() * 60 * 1000);
+};
+exports.utcDateToSameDateInLocale = utcDateToSameDateInLocale;
+/**
+ * To make sure selected/input date is correct and in the current time-zone.
+ 
+ *
+ * '2022-06-14' is considered to be '2022-06-13 00:00:00.
+ * And when date object is created it uses the current timezone.
+ *
+ * '2022-06-14' => Mon Jun 13 2022 20:00:00 GMT-0400 (Eastern Daylight Time)
+ *
+ * @param stringDate date string
+ */
+const parseFilterInputDate = (stringDate) => exports.utcDateToSameDateInLocale(new Date(stringDate));
+exports.parseFilterInputDate = parseFilterInputDate;
+/**
+ * Used to parse the date from rowDate inside date predicates.
+ * The date is parsed in moved to local timezone.
+ */
+const parseFilterValueDate = (value) => exports.utcDateToSameDateInLocale(exports.parseDateValue(value));
+exports.parseFilterValueDate = parseFilterValueDate;

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

@@ -11,4 +11,5 @@ export interface GridInfoOption {
 }
 export interface IMetamodelService extends IAdaptableService {
     getGridInfoOptions(): GridInfoOptions;
+    validateAdaptableOptionsValues(): void;
 }

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

@@ -5,7 +5,13 @@ export declare class MetamodelService implements IMetamodelService {
     private gridInfoOptions;
     constructor(adaptableApi: AdaptableApi);
     getGridInfoOptions(): GridInfoOptions;
+    validateAdaptableOptionsValues(): void;
+    private validateOptionsObject;
+    private getExpectedOptionsValueType;
     private buildGridInfoOptions;
     private mapGridInfoContainerItems;
-    destroy(): void;
+    private getAdaptableOptionsDefaultValues;
+    private getAdaptableMetamodel;
+    private getAdaptableOptionsMetamodel;
+    private getAdaptableOptions;
 }

package/src/Utilities/Services/MetamodelService.js

@@ -3,6 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MetamodelService = void 0;
 const adaptable_metamodel_1 = require("../../metamodel/adaptable.metamodel");
 const DefaultAdaptableOptions_1 = require("../Defaults/DefaultAdaptableOptions");
+const LoggingHelper_1 = require("../Helpers/LoggingHelper");
+const DocumentationLinkConstants_1 = require("../Constants/DocumentationLinkConstants");
+const supportedMetamodelTypes = [
+    'string',
+    'number',
+    'boolean',
+    'array',
+    'function',
+    'REFERENCE',
+];
 class MetamodelService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
@@ -13,17 +23,72 @@ class MetamodelService {
     getGridInfoOptions() {
         return this.gridInfoOptions;
     }
+    validateAdaptableOptionsValues() {
+        var _a;
+        LoggingHelper_1.LogAdaptableInfo('Validating Adaptable Options...');
+        const adaptableOptionsValues = this.getAdaptableOptions();
+        const adaptableOptionsMetamodel = this.getAdaptableOptionsMetamodel();
+        const adaptableOptionsDefaultValues = this.getAdaptableOptionsDefaultValues();
+        if ((_a = adaptableOptionsValues.adaptableId) === null || _a === void 0 ? void 0 : _a.includes('.')) {
+            LoggingHelper_1.ConsoleLogWarning("The 'AdaptableOptions.adaptableId' property should NOT include a '.' character.  We strongly recommend to remove it to avoid unexpected AdapTable behavior.");
+        }
+        const validationErrors = [];
+        this.validateOptionsObject(validationErrors, 'AdaptableOptions', adaptableOptionsValues, adaptableOptionsMetamodel, adaptableOptionsDefaultValues);
+        if (validationErrors.length) {
+            LoggingHelper_1.LogAdaptableWarning([
+                'AdaptableOptions validation errors:',
+                '\n',
+                ...validationErrors,
+                '\n',
+                `See AdaptableOptions documentation at ${DocumentationLinkConstants_1.AdaptableOptionsDocsLink} for details`,
+            ].join('\n'));
+        }
+    }
+    validateOptionsObject(validationErrors, optionsObjectName, optionsObject, optionsObjectMetamodel, optionsObjectDefaultValues) {
+        Object.entries(optionsObject).forEach(([optionKey, optionValue]) => {
+            const optionMetamodel = optionsObjectMetamodel.properties.find((metamodelProperty) => metamodelProperty.name === optionKey);
+            if (!optionMetamodel) {
+                validationErrors.push(`${optionsObjectName}.${optionKey} (value=${optionValue}) :: unknown/unsupported property, will be ignored`);
+                return;
+            }
+            // let's try to validate the type of the provided value
+            const expectedOptionsValueType = this.getExpectedOptionsValueType(optionMetamodel);
+            const providedOptionsValueType = Array.isArray(optionValue) ? 'array' : typeof optionValue;
+            if (!expectedOptionsValueType) {
+                return;
+            }
+            // if it's a REFERENCE, we try to go (recursively) deeper
+            if (expectedOptionsValueType === 'REFERENCE') {
+                const referenceObjectName = optionMetamodel.reference;
+                const referenceObject = optionsObject[optionKey];
+                const referenceObjectMetamodel = this.getAdaptableMetamodel()[referenceObjectName];
+                if (referenceObject && (referenceObjectMetamodel === null || referenceObjectMetamodel === void 0 ? void 0 : referenceObjectMetamodel.kind) === 'Interface') {
+                    this.validateOptionsObject(validationErrors, referenceObjectName, referenceObject, referenceObjectMetamodel, optionsObjectDefaultValues === null || optionsObjectDefaultValues === void 0 ? void 0 : optionsObjectDefaultValues[optionKey]);
+                }
+            }
+            else if (supportedMetamodelTypes.includes(providedOptionsValueType) &&
+                providedOptionsValueType !== expectedOptionsValueType) {
+                validationErrors.push(`${optionsObjectName}.${optionKey} (value=${optionValue}) :: wrong type (${providedOptionsValueType}), expected ${expectedOptionsValueType}`);
+            }
+        });
+    }
+    getExpectedOptionsValueType(metamodelProperty) {
+        const metamodelPropertyKind = metamodelProperty.kind;
+        if (supportedMetamodelTypes.includes(metamodelPropertyKind)) {
+            return metamodelPropertyKind;
+        }
+    }
     buildGridInfoOptions() {
         const gridInfoOptions = new Map();
-        const adaptableMetamodel = adaptable_metamodel_1.ADAPTABLE_METAMODEL;
-        const adaptableOptionsMetamodel = adaptableMetamodel['AdaptableOptions'];
-        const adaptableOptionsValues = this.adaptableApi.internalApi.getAdaptableOptions();
-        const adaptableOptionsDefaultValues = DefaultAdaptableOptions_1.DefaultAdaptableOptions;
+        const adaptableMetamodel = this.getAdaptableMetamodel();
+        const adaptableOptionsMetamodel = this.getAdaptableOptionsMetamodel();
+        const adaptableOptionsValues = this.getAdaptableOptions();
+        const adaptableOptionsDefaultValues = this.getAdaptableOptionsDefaultValues();
         if (!adaptableOptionsMetamodel) {
             // should never happen
             return gridInfoOptions;
         }
-        // root-level properties are grouped in a syntethic 'Base Options' container
+        // root-level properties are grouped in a synthetic 'Base Options' container
         const baseOptionsItems = this.mapGridInfoContainerItems(adaptableOptionsMetamodel, adaptableOptionsValues, adaptableOptionsDefaultValues);
         gridInfoOptions.set('baseOptions', {
             containerLabel: 'Base Options',
@@ -65,6 +130,17 @@ class MetamodelService {
             };
         });
     }
-    destroy() { }
+    getAdaptableOptionsDefaultValues() {
+        return DefaultAdaptableOptions_1.DefaultAdaptableOptions;
+    }
+    getAdaptableMetamodel() {
+        return adaptable_metamodel_1.ADAPTABLE_METAMODEL;
+    }
+    getAdaptableOptionsMetamodel() {
+        return this.getAdaptableMetamodel()['AdaptableOptions'];
+    }
+    getAdaptableOptions() {
+        return this.adaptableApi.internalApi.getAdaptableOptions();
+    }
 }
 exports.MetamodelService = MetamodelService;

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ConfigurationWizard.js

@@ -21,14 +21,16 @@ const ConfigurationWizard = (props) => {
     const handleFinish = () => {
         const newAdaptableOptions = Object.assign({}, adaptableOptions);
         newAdaptableOptions.gridOptions = Object.assign({}, adaptableOptions.gridOptions);
-        newAdaptableOptions.gridOptions.columnDefs = columnsHandle
-            .current.getColumns()
-            .map((column) => {
-            const newColumn = Object.assign(Object.assign({}, column), { headerName: column.caption || StringExtensions_1.default.Humanize(column.field) });
-            delete newColumn.caption;
-            return newColumn;
-        });
-        newAdaptableOptions.primaryKey = columnsHandle.current.getPrimaryKey();
+        if (columnsHandle.current) {
+            newAdaptableOptions.gridOptions.columnDefs = columnsHandle
+                .current.getColumns()
+                .map((column) => {
+                const newColumn = Object.assign(Object.assign({}, column), { headerName: column.caption || StringExtensions_1.default.Humanize(column.field) });
+                delete newColumn.caption;
+                return newColumn;
+            });
+            newAdaptableOptions.primaryKey = columnsHandle.current.getPrimaryKey();
+        }
         setAdaptableOptions(newAdaptableOptions);
         props.onFinish(newAdaptableOptions);
     };

package/src/View/Components/AdaptableDateInput/index.js

@@ -21,7 +21,7 @@ const AdaptableDateInput = React.forwardRef((props, ref) => {
             });
         },
     });
-    const dateValue = new Date(value);
+    const dateValue = DateHelper_1.parseFilterInputDate(value);
     const datepickerProps = Object.assign({ 
         // this is OK as long as we do not support range datepicker
         value: dateValue, onChange: (dateValue) => { var _a; 

package/src/View/Components/FilterForm/QuickFilterForm.js

@@ -325,7 +325,7 @@ class QuickFilterFormComponent extends React.Component {
         this.props.api.filterApi.clearColumnFilterByColumn(filter.ColumnId);
     }
     hasValuesPredicate(predicate) {
-        return (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'Values' || (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'ExcludeValues';
+        return this.props.api.predicateApi.hasPredicateValues(predicate);
     }
 }
 function mapStateToProps(state, ownProps) {

package/src/View/GridInfo/GridInfoPopup.js

@@ -52,7 +52,9 @@ const GridInfoPopup = (props) => {
         const calcColumns = props.api.calculatedColumnApi
             .getAllCalculatedColumn()
             .map((c) => c.ColumnId);
-        const actionColumns = props.api.actionApi.getAllActionColumn().map((c) => c.columnId);
+        const actionColumns = props.api.actionApi
+            .getAllActionColumn()
+            .map((ac) => ac.columnId);
         const freeTextColumns = props.api.freeTextColumnApi
             .getAllFreeTextColumn()
             .map((c) => c.ColumnId);

package/src/View/StatusBar/StatusBarPopup.js

@@ -39,6 +39,6 @@ const StatusBarPopup = (props) => {
             dragAndDropTab: false,
             deleteTab: false,
             editTabName: false,
-        }, onTabsChange: handleTabChange, disabled: disabled, tabs: tabs, availableItems: availableItems, tabsTitle: 'Status Bar Panels', unusedPanelTitle: "Available Status Panels", dragItemText: "Drag into a Status Bar Panel below" })) : (React.createElement(EmptyContent_1.default, null, "To enable this feature add to Grid Options statusPanels the Adaptable Status Panel."))));
+        }, onTabsChange: handleTabChange, disabled: disabled, tabs: tabs, availableItems: availableItems, tabsTitle: 'AdapTable Status Bar Panels', unusedPanelTitle: "Available Module Status Panels", dragItemText: "Drag into a Status Bar Panel below" })) : (React.createElement(EmptyContent_1.default, null, "To enable this feature add to Grid Options statusPanels the Adaptable Status Panel."))));
 };
 exports.StatusBarPopup = StatusBarPopup;

package/src/agGrid/Adaptable.js

@@ -345,7 +345,7 @@ class Adaptable {
         }
         this.emitter = new Emitter_1.default();
         // we create AdaptableOptions by merging the values provided by the user with the defaults (where no value has been set)
-        this.adaptableOptions = AdaptableHelper_1.default.assignadaptableOptions(adaptableOptions);
+        this.adaptableOptions = AdaptableHelper_1.default.assignAdaptableOptions(adaptableOptions);
         if (this.hasAutogeneratedPrimaryKey()) {
             LoggingHelper_1.LogAdaptableWarning(`Autogenerated primary key (adaptableOptions.autogeneratedPrimaryKey = TRUE) should be used only as a last resort,
       when no unique column is available, as it limits some Adaptable functionalities!
@@ -354,7 +354,6 @@ class Adaptable {
             this.adaptableOptions.primaryKey = GeneralConstants_1.AUTOGENERATED_PK_COLUMN;
         }
         Adaptable.collectInstance(this);
-        AdaptableHelper_1.default.checkAdaptableOptions(this.adaptableOptions);
         this.runtimeConfig = runtimeConfig || {};
         this.agGridModules = this.runtimeConfig.modules || [];
         this.gridOptions = this.adaptableOptions.gridOptions;
@@ -420,6 +419,8 @@ class Adaptable {
         if (this.gridOptions.columnTypes.abColDefDate.cellEditor === undefined) {
             this.gridOptions.columnTypes.abColDefDate.cellEditor = AdaptableDateEditor_1.AdaptableDateEditor;
         }
+        // validate the provided AdaptableOptions
+        this.MetamodelService.validateAdaptableOptionsValues();
         return this.initializeAgGrid().then((initialized) => {
             if (!initialized) {
                 // we have no grid, we can't do anything
@@ -2934,12 +2935,14 @@ class Adaptable {
         this.prepareGrid();
     }
     updateColumnFilterActiveState() {
+        var _a;
         const columnFilters = this.api.filterApi.getColumnFilters();
-        const isFilterActive = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(columnFilters);
+        const activeFilters = (_a = columnFilters === null || columnFilters === void 0 ? void 0 : columnFilters.filter) === null || _a === void 0 ? void 0 : _a.call(columnFilters, (columnFilter) => this.api.filterApi.isFilterActive(columnFilter));
+        const isFilterActive = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(activeFilters);
         const columnsWithActiveFilters = {};
         if (isFilterActive) {
             // used in particular at init time to show the filter icon correctly
-            for (const colFilter of columnFilters) {
+            for (const colFilter of activeFilters) {
                 const agGridCol = this.gridOptions.columnApi.getColumn(colFilter.ColumnId);
                 if (agGridCol) {
                     columnsWithActiveFilters[agGridCol.getColId()] = true;

package/src/components/Dashboard/Dashboard.js

@@ -43,7 +43,7 @@ function Dashboard(props) {
             } }, child.props.title)))));
     const renderTabsDropdown = () => {
         var _a, _b, _c;
-        if (children && children.length === 0) {
+        if (children && children.length < 2) {
             return null;
         }
         const activeTabTitle = (_c = (_b = (_a = children === null || children === void 0 ? void 0 : children[activeTabIndex]) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.title) !== null && _c !== void 0 ? _c : 'Select Toolbar';
@@ -72,6 +72,7 @@ function Dashboard(props) {
     const renderHomeToolbar = () => (React.createElement(DashboardToolbar_1.DashboardToolbar, { onConfigure: onShowDashboardPopup, className: "ab-Dashboard__home-toolbar", title: title, tooltip: `Configure Dashboard`, showConfigure: true, showClose: false, accessLevel: 'Full' },
         left,
         right,
+        children && children.length > 1,
         renderTabsDropdown()));
     return (React.createElement("div", { 
         // @ts-ignore

package/src/metamodel/adaptable-metamodel-model.d.ts

@@ -16,4 +16,4 @@ export interface MetamodelItemProperty {
     gridInfo?: 'item' | 'container';
     noCode?: 'item' | 'container';
 }
-export declare type MetamodelItemPropertyKind = 'REFERENCE' | 'number' | 'string' | 'boolean' | 'date' | 'function' | 'indexType' | 'unknown';
+export declare type MetamodelItemPropertyKind = 'REFERENCE' | 'number' | 'string' | 'boolean' | 'date' | 'function' | 'array' | 'indexType' | 'unknown';

package/src/metamodel/adaptable.metamodel.d.ts

@@ -296,6 +296,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
     };
+    AdaptableDataChangeHistoryAction: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     AdaptableExternalIcon: {
         name: string;
         kind: string;
@@ -1403,8 +1408,8 @@ export declare const ADAPTABLE_METAMODEL: {
             description: string;
             uiLabel: string;
             isOptional: boolean;
+            defaultValue: string;
             gridInfo?: undefined;
-            defaultValue?: undefined;
         })[];
     };
     ColumnSort: {
@@ -1693,6 +1698,28 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            reference: string;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+            isOptional?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional?: undefined;
+            reference?: undefined;
+        })[];
     };
     CustomDestination: {
         name: string;
@@ -1728,6 +1755,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
     };
+    CustomRenderContext: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     CustomReport: {
         name: string;
         kind: string;
@@ -2021,6 +2053,29 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
         }[];
     };
+    DataChangeHistoryButton: {
+        name: string;
+        kind: string;
+        description: string;
+    };
+    DataChangeHistoryContext: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference?: undefined;
+        })[];
+    };
     DataChangeHistoryOptions: {
         name: string;
         kind: string;
@@ -2039,8 +2094,8 @@ export declare const ADAPTABLE_METAMODEL: {
             description: string;
             uiLabel: string;
             isOptional: boolean;
+            defaultValue: string;
             gridInfo?: undefined;
-            defaultValue?: undefined;
         })[];
     };
     DataSet: {
@@ -2125,6 +2180,19 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference?: undefined;
+        })[];
     };
     EditActionRowContext: {
         name: string;
@@ -2148,6 +2216,19 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference?: undefined;
+        })[];
     };
     EditLookUpPermittedValues: {
         name: string;
@@ -2172,8 +2253,8 @@ export declare const ADAPTABLE_METAMODEL: {
             description: string;
             uiLabel: string;
             isOptional: boolean;
+            defaultValue: string;
             gridInfo?: undefined;
-            defaultValue?: undefined;
         })[];
     };
     EntitlementOptions: {
@@ -3129,6 +3210,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
     };
+    LayoutAssociatedObjectLoadConfig: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     LayoutAvailableContext: {
         name: string;
         kind: string;
@@ -4084,16 +4170,8 @@ export declare const ADAPTABLE_METAMODEL: {
             description: string;
             uiLabel: string;
             isOptional: boolean;
+            defaultValue: string;
             reference?: undefined;
-            defaultValue?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-            reference: string;
-            defaultValue?: undefined;
         } | {
             name: string;
             kind: string;
@@ -4101,7 +4179,7 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
             isOptional: boolean;
             defaultValue: string;
-            reference?: undefined;
+            reference: string;
         })[];
     };
     StatusBarState: {