@adaptabletools/adaptable 22.1.1 → 23.0.0-canary.1

package/src/AdaptableState/Common/AdaptableForm.js

@@ -1,6 +1,215 @@
+/**
+ * Returns true if the supplied entry from a form's `fields` array is a
+ * group rather than a single field or an inline-row array of fields.
+ */
+export function isAdaptableFormFieldGroup(entry) {
+    return !!entry && !Array.isArray(entry) && entry.kind === 'group';
+}
+/**
+ * Flattens a form's `fields` array (which may contain field groups and
+ * inline-row arrays) into a single flat list of fields. Useful when
+ * computing defaults, validation or per-field lookups.
+ */
+export function flattenAdaptableFormFields(formDef) {
+    const out = [];
+    for (const entry of formDef?.fields ?? []) {
+        if (Array.isArray(entry)) {
+            out.push(...entry);
+        }
+        else if (isAdaptableFormFieldGroup(entry)) {
+            for (const inner of entry.fields) {
+                if (Array.isArray(inner)) {
+                    out.push(...inner);
+                }
+                else {
+                    out.push(inner);
+                }
+            }
+        }
+        else {
+            out.push(entry);
+        }
+    }
+    return out;
+}
 export function getDefaultAdaptableFormData(formDef) {
-    return (formDef.fields || []).flat().reduce((data, field) => {
-        data[field.name] = field.defaultValue ?? '';
+    return flattenAdaptableFormFields(formDef).reduce((data, field) => {
+        if (field.fieldType === 'select' && field.multi) {
+            // Multi-selects always work in terms of arrays. Allow the consumer to
+            // supply an explicit defaultValue (which may already be an array) but
+            // fall back to an empty array rather than '' so downstream code never
+            // has to guard against a string value.
+            data[field.name] = Array.isArray(field.defaultValue)
+                ? field.defaultValue
+                : field.defaultValue == null || field.defaultValue === ''
+                    ? []
+                    : [field.defaultValue];
+        }
+        else {
+            data[field.name] = field.defaultValue ?? '';
+        }
         return data;
     }, {});
 }
+/**
+ * Resolves a field's `options` to the current array of options.
+ *
+ * - When `options` is already an array, it's returned as-is.
+ * - When it's a synchronous function, the function is invoked.
+ * - When the function returns a Promise this helper returns `undefined` -
+ *   asynchronous resolution is the caller's responsibility (the
+ *   `AdaptableFormComponent` resolves promises via internal state).
+ */
+export function resolveAdaptableFormFieldOptionsSync(field, formData, context) {
+    const opts = field.options;
+    if (!opts)
+        return [];
+    if (Array.isArray(opts))
+        return opts;
+    const result = opts(formData, context);
+    if (result instanceof Promise)
+        return undefined;
+    return result;
+}
+/**
+ * Returns true if the given field should be hidden given the current form
+ * data and context. Resolves both boolean and function forms of `hidden`.
+ */
+export function isAdaptableFormFieldHidden(field, formData, context) {
+    if (typeof field.hidden === 'function') {
+        return !!field.hidden(formData, context);
+    }
+    return !!field.hidden;
+}
+/**
+ * Returns true if the given group should be hidden given the current
+ * form data and context.
+ */
+export function isAdaptableFormFieldGroupHidden(group, formData, context) {
+    if (typeof group.hidden === 'function') {
+        return !!group.hidden(formData, context);
+    }
+    return !!group.hidden;
+}
+/**
+ * Returns true if the given field should be disabled given the current
+ * form data and context. Resolves both boolean and function forms of
+ * `disabled`.
+ */
+export function isAdaptableFormFieldDisabled(field, formData, context) {
+    if (typeof field.disabled === 'function') {
+        return !!field.disabled(formData, context);
+    }
+    return !!field.disabled;
+}
+/**
+ * Validates an entire AdaptableForm. Hidden fields and fields inside
+ * hidden groups are skipped. Returns a map of field-name to error
+ * message; fields without entries are valid.
+ *
+ * Validation order per field: `required` -> built-in (min/max/length/
+ * pattern) -> custom `validate`. The first failing check wins.
+ */
+export function validateAdaptableForm(formDef, formData, context) {
+    const errors = {};
+    for (const entry of formDef?.fields ?? []) {
+        if (isAdaptableFormFieldGroup(entry)) {
+            if (isAdaptableFormFieldGroupHidden(entry, formData, context)) {
+                continue;
+            }
+            const innerFlat = entry.fields.flatMap((f) => (Array.isArray(f) ? f : [f]));
+            for (const field of innerFlat) {
+                validateOne(field, formData, context, errors);
+            }
+        }
+        else if (Array.isArray(entry)) {
+            for (const field of entry) {
+                validateOne(field, formData, context, errors);
+            }
+        }
+        else {
+            validateOne(entry, formData, context, errors);
+        }
+    }
+    return errors;
+}
+function validateOne(field, formData, context, errors) {
+    if (isAdaptableFormFieldHidden(field, formData, context)) {
+        return;
+    }
+    const error = validateAdaptableFormField(field, formData, context);
+    if (error) {
+        errors[field.name] = error;
+    }
+}
+function validateAdaptableFormField(field, formData, context) {
+    const value = formData[field.name];
+    // textOutput is read-only; never produces validation errors
+    if (field.fieldType === 'textOutput') {
+        return null;
+    }
+    // 1) required
+    if (field.required) {
+        const isEmpty = value == null ||
+            value === '' ||
+            (field.fieldType === 'checkbox' && value === false) ||
+            (field.fieldType === 'select' && field.multi && Array.isArray(value) && value.length === 0);
+        if (isEmpty) {
+            return `${field.label} is required`;
+        }
+    }
+    // empty optional values skip subsequent built-ins
+    const isProvided = value != null && value !== '';
+    // 2) built-in numeric / length / pattern checks
+    if (isProvided) {
+        if (field.fieldType === 'number' || field.fieldType === 'slider') {
+            const numValue = Number(value);
+            if (!Number.isNaN(numValue)) {
+                if (typeof field.min === 'number' && numValue < field.min) {
+                    return `${field.label} must be at least ${field.min}`;
+                }
+                if (typeof field.max === 'number' && numValue > field.max) {
+                    return `${field.label} must be at most ${field.max}`;
+                }
+            }
+        }
+        if (field.fieldType === 'date' ||
+            field.fieldType === 'time' ||
+            field.fieldType === 'datetime') {
+            if (typeof field.min === 'string' && value < field.min) {
+                return `${field.label} must be on or after ${field.min}`;
+            }
+            if (typeof field.max === 'string' && value > field.max) {
+                return `${field.label} must be on or before ${field.max}`;
+            }
+        }
+        if (field.fieldType === 'text' || field.fieldType === 'textarea') {
+            const strValue = String(value);
+            if (typeof field.minLength === 'number' && strValue.length < field.minLength) {
+                return `${field.label} must be at least ${field.minLength} characters`;
+            }
+            if (typeof field.maxLength === 'number' && strValue.length > field.maxLength) {
+                return `${field.label} must be at most ${field.maxLength} characters`;
+            }
+            if (field.fieldType === 'text' && field.pattern) {
+                try {
+                    const re = new RegExp(field.pattern);
+                    if (!re.test(strValue)) {
+                        return `${field.label} is not in the expected format`;
+                    }
+                }
+                catch {
+                    // invalid pattern - silently ignore so we don't crash the form
+                }
+            }
+        }
+    }
+    // 3) custom validation
+    if (field.validate) {
+        const customError = field.validate(value, formData, context);
+        if (customError) {
+            return customError;
+        }
+    }
+    return null;
+}

package/src/AdaptableState/Common/AdaptableIcon.d.ts

@@ -54,4 +54,4 @@ export interface AdaptableBaseIcon {
 /**
  * All AdapTable System Icon names
  */
-export type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'calculated-column' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'copy' | 'comment' | 'comments' | 'contains' | 'dashboard' | 'json' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'excel' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'filter-off' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'inspector' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'select-all' | 'select-off' | 'select-fwd' | 'styled-grid' | 'sync' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'resume' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import' | 'grid-filter' | 'grid-info' | 'csv' | 'rows' | 'expand-all' | 'collapse-all' | 'column-outline';
+export type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'calculated-column' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'copy' | 'comment' | 'comments' | 'contains' | 'dashboard' | 'json' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'excel' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'filter-off' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'inspector' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'select-all' | 'select-off' | 'select-fwd' | 'styled-grid' | 'sync' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'resume' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'bullet-chart' | 'range-bar' | 'icon-style' | 'star' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import' | 'grid-filter' | 'grid-info' | 'csv' | 'rows' | 'expand-all' | 'collapse-all' | 'column-outline';

package/src/AdaptableState/Common/AdaptablePredicate.js

@@ -107,9 +107,29 @@ export const SystemPredicateDefs = [
                 return result;
             }
             if (column.dataType === 'date') {
+                // Inputs come from one of two flows:
+                //   1. The default-values tree's calendar leaves — short strings
+                //      like "2024", "2024-01" or "2024-01-15" (no time component).
+                //   2. A full timestamp — either the tree's optional time leaf or
+                //      the `customInFilterValues` + `orderedValues` path, where
+                //      `Date` values are normalised to ISO strings (always carrying
+                //      a `T` separator).
+                //
+                // `evaluateInPredicateUsingTime` is only meaningful for case (1):
+                // it switches the calendar leaf between day-level matching and
+                // exact-instant matching against the cell's `Date`. For case (2)
+                // the user has explicitly picked a specific instant, so we always
+                // compare with time regardless of the option.
                 return inputs.some((input) => {
-                    if (adaptableApi.predicateApi.internalApi.shouldEvaluateInPredicateUsingTime(column.columnId)) {
-                        return isEqual(input, value);
+                    const hasTimeComponent = typeof input === 'string' && input.includes('T');
+                    const useTime = hasTimeComponent ||
+                        adaptableApi.predicateApi.internalApi.shouldEvaluateInPredicateUsingTime(column.columnId);
+                    if (useTime) {
+                        // `input` may be a string (e.g. an ISO timestamp serialised through
+                        // JSON when the listbox tree dropdown round-trips path keys), so
+                        // normalise both sides to `Date` before comparing — date-fns
+                        // `isEqual` only accepts `Date | number`.
+                        return isEqual(parseDateValue(input), parseDateValue(value));
                     }
                     else {
                         return isSameDay(parseDateValue(input), parseDateValue(value));

package/src/AdaptableState/Common/AdaptableStyle.d.ts

@@ -1,19 +1,23 @@
 /**
- * Style object used in numerous AdapTable Modules
+ * Behaviour for aligning Cell contents
  */
-export interface AdaptableStyle {
-    /**
-     * Colour background of cell: hex, rgb(a) or name
-     */
-    BackColor?: string;
+export type Alignment = 'Left' | 'Right' | 'Center' | 'Default';
+/**
+ * The "text" half of an `AdaptableStyle`: everything that affects the
+ * rendering of text (and, by convention, the alignment of the cell's primary
+ * content block — for plain text that is `text-align`, for Badge it is the
+ * alignment of the badge row).
+ *
+ * Used as a `Font?` slot on Styled Columns whose renderer paints a non-text
+ * primary content (Gradient tint, Percent Bar, Bullet Chart) so the column
+ * can still control the cell's text styling without inheriting any other
+ * properties from a Format Column.
+ */
+export interface CellFontStyle {
     /**
      * Font colour in cell: hex, rgb(a) or name
      */
     ForeColor?: string;
-    /**
-     * Colour of cell border: hex, rgb(a) or name
-     */
-    BorderColor?: string;
     /**
      * Weight of font: `Normal` or `Bold`
      */
@@ -31,19 +35,45 @@ export interface AdaptableStyle {
      */
     FontSize?: 'XSmall' | 'Small' | 'Medium' | 'Large' | 'XLarge';
     /**
-     * Rounds corners of an element's outer border edge; equivalent of CSS border-radius
+     * Align to `Left`, `Right` or `Center`
      */
-    BorderRadius?: number;
+    Alignment?: Alignment;
+}
+/**
+ * The "box" half of an `AdaptableStyle`: everything that paints the cell box
+ * (background colour and the border that wraps the cell).
+ *
+ * Used as a `Cell?` slot on Styled Columns whose renderer paints into the
+ * cell content but leaves the cell chrome alone (Rating, Sparkline) so the
+ * column can opt-in to a tinted/bordered cell without inheriting other
+ * properties from a Format Column.
+ */
+export interface CellBoxStyle {
     /**
-     * Existing CSS Class; use instead of setting other object properties
+     * Colour background of cell: hex, rgb(a) or name
      */
-    ClassName?: string;
+    BackColor?: string;
     /**
-     * Align to `Left`, `Right` or `Center`
+     * Colour of cell border: hex, rgb(a) or name
      */
-    Alignment?: Alignment;
+    BorderColor?: string;
+    /**
+     * Rounds corners of an element's outer border edge; equivalent of CSS border-radius
+     */
+    BorderRadius?: number;
 }
 /**
- * Behaviour for aligning Cell contents
+ * Style object used in numerous AdapTable Modules.
+ *
+ * Composed of two reusable slices — `CellFontStyle` (text) and `CellBoxStyle`
+ * (cell chrome) — plus a `ClassName` escape hatch. The shape is unchanged
+ * from previous releases; the slices exist so that Styled Columns can opt-in
+ * to a single slice (`Font` or `Cell`) without having to embed a full
+ * `AdaptableStyle`.
  */
-export type Alignment = 'Left' | 'Right' | 'Center' | 'Default';
+export interface AdaptableStyle extends CellFontStyle, CellBoxStyle {
+    /**
+     * Existing CSS Class; use instead of setting other object properties
+     */
+    ClassName?: string;
+}

package/src/AdaptableState/Common/AggregationColumns.d.ts

@@ -2,7 +2,12 @@
  * Defines which Columns in a Layout display Aggregated values when Row-Grouped
  */
 import { PivotTotalPosition } from '../LayoutState';
-export type AggregationColumnValue = string | true | WeightedAverageAggregation;
+/**
+ * Aggregations that require extra configuration beyond a single aggFunc name.
+ * Extend this union when adding new parameterized aggregation types.
+ */
+export type ParameterizedAggFunc = WeightedAverageAggregation;
+export type AggregationColumnValue = string | true | ParameterizedAggFunc;
 /**
  * Defines an Aggregated Column in a Table Layout
  */

package/src/AdaptableState/Common/AggregationColumns.js

@@ -10,10 +10,8 @@ export const getAggFuncName = (aggFunc) => {
     if (isWeightedAverageAggregation(aggFunc)) {
         return WEIGHTED_AVERAGE_AGG_FN_NAME;
     }
-    else if (typeof aggFunc === 'string') {
-        return aggFunc;
-    }
-    else {
+    if (typeof aggFunc === 'string') {
         return aggFunc;
     }
+    return aggFunc;
 };

package/src/AdaptableState/Common/Enums.d.ts

@@ -5,10 +5,7 @@ export declare enum MathOperation {
     Divide = "Divide"
 }
 export declare enum ScheduleType {
-    Report = "Report",
-    ipushpull = "ipushpull",
-    Reminder = "Reminder",
-    OpenFin = "OpenFin"
+    Reminder = "Reminder"
 }
 export declare enum SortOrder {
     Asc = "Asc",

package/src/AdaptableState/Common/Enums.js

@@ -9,10 +9,7 @@ export var MathOperation;
 // Enums used in Strategies
 export var ScheduleType;
 (function (ScheduleType) {
-    ScheduleType["Report"] = "Report";
-    ScheduleType["ipushpull"] = "ipushpull";
     ScheduleType["Reminder"] = "Reminder";
-    ScheduleType["OpenFin"] = "OpenFin";
 })(ScheduleType || (ScheduleType = {}));
 export var SortOrder;
 (function (SortOrder) {

package/src/AdaptableState/Common/ExtendedLayout.d.ts

@@ -6,7 +6,7 @@ import { FormatColumn } from '../FormatColumnState';
 import { PlusMinusNudge } from '../PlusMinusState';
 import { Shortcut } from '../ShortcutState';
 import { StyledColumn } from '../StyledColumnState';
-import { BaseSchedule } from './Schedule';
+import { ReportSchedule } from '../ExportState';
 /**
  * Defines an Extended Layout - provides a Layout and all objects that refer to it
  */
@@ -36,11 +36,11 @@ export interface LayoutExtension {
 /**
  * Types of Adaptable Objects that can added to Extended Layouts
  */
-export type LayoutExtensionObject = AlertDefinition | CustomSort | FlashingCellDefinition | FormatColumn | PlusMinusNudge | StyledColumn | Shortcut | BaseSchedule;
+export type LayoutExtensionObject = AlertDefinition | CustomSort | FlashingCellDefinition | FormatColumn | PlusMinusNudge | StyledColumn | Shortcut | ReportSchedule;
 /**
  * Modules which can provide objects in Extended Layouts
  */
-export type LayoutExtensionModule = 'Alert' | 'CustomSort' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'PlusMinus' | 'Schedule' | 'Shortcut' | 'StyledColumn';
+export type LayoutExtensionModule = 'Alert' | 'CustomSort' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'PlusMinus' | 'Export' | 'Shortcut' | 'StyledColumn';
 /**
  * Configuration for API methods which load objects that can be Layout extensions
  */

package/src/AdaptableState/Common/Menu.d.ts

@@ -16,7 +16,7 @@ export type AdaptableContextMenuItemName = (typeof ADAPTABLE_CONTEXT_MENU_ITEMS)
 /**
  * List of Shipped Adaptable Column Menu Items
  */
-export declare const ADAPTABLE_COLUMN_MENU_ITEMS: readonly ["calculated-column-edit", "cell-summary-show", "chart-show", "column-group", "column-filter-group", "column-filter-bar-hide", "column-filter-bar-show", "column-filter-clear", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "custom-sort-add", "custom-sort-edit", "dashboard-group", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "flashing-cell-add", "flashing-cell-delete", "format-column-add", "format-column-edit", "free-text-column-edit", "grid-group", "grid-info-show", "layout-column-caption-change", "layout-column-hide", "layout-edit", "layout-column-select", "layout-column-select-preserve", "layout-column-select-reset", "layout-grid-select", "plus-minus-add", "settings-panel-open", "styling-group", "styled-column-badge-add", "styled-column-badge-edit", "styled-column-gradient-add", "styled-column-gradient-edit", "styled-column-percent-bar-add", "styled-column-percent-bar-edit", "styled-column-sparkline-add", "styled-column-sparkline-edit", "system-status-show", "_navbar", "separator"];
+export declare const ADAPTABLE_COLUMN_MENU_ITEMS: readonly ["calculated-column-edit", "cell-summary-show", "chart-show", "column-group", "column-filter-group", "column-filter-bar-hide", "column-filter-bar-show", "column-filter-clear", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "custom-sort-add", "custom-sort-edit", "dashboard-group", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "flashing-cell-add", "flashing-cell-delete", "format-column-add", "format-column-edit", "free-text-column-edit", "grid-group", "grid-info-show", "layout-column-caption-change", "layout-column-hide", "layout-edit", "layout-column-select", "layout-column-select-preserve", "layout-column-select-reset", "layout-grid-select", "plus-minus-add", "select-column-group", "select-grid-group", "select-group", "settings-panel-open", "styling-group", "styled-column-badge-add", "styled-column-badge-edit", "styled-column-gradient-add", "styled-column-gradient-edit", "styled-column-percent-bar-add", "styled-column-percent-bar-edit", "styled-column-sparkline-add", "styled-column-sparkline-edit", "styled-column-bullet-chart-add", "styled-column-bullet-chart-edit", "styled-column-rating-add", "styled-column-rating-edit", "styled-column-range-bar-add", "styled-column-range-bar-edit", "styled-column-icon-add", "styled-column-icon-edit", "system-status-show", "_navbar", "separator"];
 /**
  * List of Shipped Adaptable Context Menu Items
  */

package/src/AdaptableState/Common/Menu.js

@@ -39,6 +39,9 @@ export const ADAPTABLE_COLUMN_MENU_ITEMS = [
     'layout-column-select-reset',
     'layout-grid-select',
     'plus-minus-add',
+    'select-column-group',
+    'select-grid-group',
+    'select-group',
     'settings-panel-open',
     'styling-group',
     'styled-column-badge-add',
@@ -49,6 +52,14 @@ export const ADAPTABLE_COLUMN_MENU_ITEMS = [
     'styled-column-percent-bar-edit',
     'styled-column-sparkline-add',
     'styled-column-sparkline-edit',
+    'styled-column-bullet-chart-add',
+    'styled-column-bullet-chart-edit',
+    'styled-column-rating-add',
+    'styled-column-rating-edit',
+    'styled-column-range-bar-add',
+    'styled-column-range-bar-edit',
+    'styled-column-icon-add',
+    'styled-column-icon-edit',
     'system-status-show',
     '_navbar', // used in SettingsPanel navigation bar and in Dashboard Module buttons
     'separator',

package/src/AdaptableState/Common/Schedule.d.ts

@@ -1,41 +1,19 @@
-import { AdaptableObject, SuspendableObject } from '../../types';
 /**
- * Defines when an action will be run - either one-off or recurring
+ * Defines when an action will run — either once or recurring
  */
 export interface Schedule {
     /**
-     * Hour the Schedule will run
+     * If true, the schedule runs once (using RunAt)
      */
-    Hour: number;
+    IsOneOff: boolean;
     /**
-     * Minute the Schedule will run
+     * ISO datetime for a one-off run (local time); set when IsOneOff is true
      */
-    Minute: number;
+    RunAt?: string;
     /**
-     * A one off date on which the Schedule will run
+     * Standard 5-field cron (minute hour day-of-month month day-of-week); e.g. weekdays at 09:30 → `30 9 * * 1-5`
      */
-    OneOffDate?: string;
-    /**
-     * Days on which Schedule will run
-     */
-    DaysOfWeek?: Weekdays;
-}
-/**
- * Base Schedule object
- */
-export interface BaseSchedule extends AdaptableObject, SuspendableObject {
-    /**
-     * Name of the Schedule
-     */
-    Name: string;
-    /**
-     * The Schedule to run
-     */
-    Schedule: Schedule;
-    /**
-     * The type of Schedule
-     */
-    ScheduleType: 'Report' | 'ipushpull' | 'Reminder' | 'OpenFin';
+    CronExpression?: string;
 }
 export type Weekdays = Weekday[];
 export type Weekday = 'Sunday' | 'Monday' | 'Tuesday' | 'Wednesday' | 'Thursday' | 'Friday' | 'Saturday';

package/src/AdaptableState/Common/Types.d.ts

@@ -11,7 +11,7 @@ export declare const ALL_TOOLBARS: AdaptableDashboardToolbar[];
 /**
  * Modules which can appear in the AdapTable Status Bar
  */
-export type AdaptableStatusBarPanel = 'Alert' | 'CalculatedColumn' | 'BulkUpdate' | 'CellSummary' | 'Charting' | 'Comment' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataImport' | 'DataSet' | 'Export' | 'ColumnFilter' | 'GridFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'Note' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'SmartEdit' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
+export type AdaptableStatusBarPanel = 'Alert' | 'CalculatedColumn' | 'BulkUpdate' | 'CellSummary' | 'Charting' | 'Comment' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataImport' | 'DataSet' | 'Export' | 'ColumnFilter' | 'GridFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'Note' | 'PlusMinus' | 'QuickSearch' | 'SettingsPanel' | 'SmartEdit' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
 export declare const ALL_STATUS_SUB_PANELS: AdaptableStatusBarPanel[];
 export type AdaptableToolPanels = AdaptableToolPanel[];
 /**
@@ -28,18 +28,18 @@ export type AdaptableModuleButtons = AdaptableModuleButton[];
 /**
  * List of all the Module buttons Adaptable provides - each Module has a popup for which this is a shortcut button
  */
-export type AdaptableModuleButton = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Comment' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataImport' | 'DataSet' | 'Export' | 'ColumnFilter' | 'GridFilter' | 'NamedQuery' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'Note' | 'OpenFin' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme';
+export type AdaptableModuleButton = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Comment' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataImport' | 'DataSet' | 'Export' | 'ColumnFilter' | 'GridFilter' | 'NamedQuery' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'Note' | 'OpenFin' | 'PlusMinus' | 'QuickSearch' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme';
 export type AdaptableStateKeys = AdaptableStateKey[];
 export type AdaptableStateKey = keyof AdaptablePersistentState | 'OpenFin' | 'IPushPull';
 /**
  * Modules provided by AdapTable, subject to Entitlements and usually have Initial Adaptable State
  */
-export type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'Comment' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Fdc3' | 'ColumnFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'ColumnInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Note' | 'DataImport' | 'GridFilter' | 'NamedQuery';
+export type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'Comment' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Fdc3' | 'ColumnFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'ColumnInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'QuickSearch' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Note' | 'DataImport' | 'GridFilter' | 'NamedQuery';
 export declare const ALL_MODULES: AdaptableModule[];
 /**
  * Modules which can appear in the Settings Panel
  */
-export type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'ColumnFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'ColumnInfo' | 'Layout' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'StyledColumn' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Note' | 'DataImport' | 'GridFilter' | 'NamedQuery' | 'Comment';
+export type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'ColumnFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'ColumnInfo' | 'Layout' | 'PlusMinus' | 'QuickSearch' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'StyledColumn' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Note' | 'DataImport' | 'GridFilter' | 'NamedQuery' | 'Comment';
 export type TypeHint<Base, Literals> = (Base & {
     __subType?: true;
 }) | Literals;

package/src/AdaptableState/Common/Types.js

@@ -44,7 +44,6 @@ export const ALL_STATUS_SUB_PANELS = [
     'Note',
     'PlusMinus',
     'QuickSearch',
-    'Schedule',
     'SettingsPanel',
     'Shortcut',
     'SmartEdit',
@@ -97,7 +96,6 @@ export const ALL_MODULES = [
     ModuleConstants.OpenFinModuleId,
     ModuleConstants.PlusMinusModuleId,
     ModuleConstants.QuickSearchModuleId,
-    ModuleConstants.ScheduleModuleId,
     ModuleConstants.SettingsPanelModuleId,
     ModuleConstants.ShortcutModuleId,
     ModuleConstants.SmartEditModuleId,

package/src/AdaptableState/DashboardState.d.ts

@@ -28,11 +28,6 @@ export interface DashboardState extends BaseState {
      *  @defaultValue false
      */
     IsFloating?: boolean;
-    /**
-     * Alternative way of rendering Dashboard, with headers section to left of Toolbars
-     * @defaultValue false
-     */
-    IsInline?: boolean;
     /**
      * Whether Dashboard is completely hidden - can be made visible again in Column Menu and Tool Panel
      * @defaultValue false