@adaptabletools/adaptable 13.0.4 → 13.0.6

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -15,7 +15,6 @@ const isFuture_1 = tslib_1.__importDefault(require("date-fns/isFuture"));
 const isAfter_1 = tslib_1.__importDefault(require("date-fns/isAfter"));
 const isBefore_1 = tslib_1.__importDefault(require("date-fns/isBefore"));
 const isSameDay_1 = tslib_1.__importDefault(require("date-fns/isSameDay"));
-const CalendarHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/CalendarHelper"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const DateHelper_1 = require("../../Utilities/Helpers/DateHelper");
 /**
@@ -27,7 +26,7 @@ exports.SystemPredicateDefs = [
         label: 'Values',
         icon: { text: 'IN' },
         columnScope: { DataTypes: ['String', 'Number', 'Date'] },
-        moduleScope: ['filter', 'conditionalstyle', 'formatColumn', 'alert'],
+        moduleScope: ['filter', 'formatColumn', 'alert'],
         handler: ({ inputs, column, value }) => {
             if (inputs.length === 0) {
                 return true;
@@ -53,7 +52,7 @@ exports.SystemPredicateDefs = [
         label: 'Exclude Values',
         icon: { text: '!IN' },
         columnScope: { DataTypes: ['String', 'Number', 'Date'] },
-        moduleScope: ['filter', 'conditionalstyle', 'formatColumn', 'alert'],
+        moduleScope: ['filter', 'formatColumn', 'alert'],
         handler: ({ inputs, column, value }) => {
             // basically negation of IN
             if (inputs.length === 0) {
@@ -79,7 +78,7 @@ exports.SystemPredicateDefs = [
         label: 'Blanks',
         icon: { name: 'blanks' },
         columnScope: { All: true },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Helper_1.default.IsInputNullOrEmpty(value),
     },
     {
@@ -87,7 +86,7 @@ exports.SystemPredicateDefs = [
         label: 'Non Blanks',
         icon: { name: 'non-blanks' },
         columnScope: { All: true },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Helper_1.default.IsInputNotNullOrEmpty(value),
     },
     // Numeric System Filters
@@ -96,7 +95,7 @@ exports.SystemPredicateDefs = [
         label: 'Greater Than',
         icon: { name: 'greater-than' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => Number(value) > Number(inputs[0]),
         toString: ({ inputs }) => `> ${inputs[0]}`,
@@ -107,7 +106,7 @@ exports.SystemPredicateDefs = [
         label: 'Less Than',
         icon: { name: 'less-than' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => Number(value) < Number(inputs[0]),
         toString: ({ inputs }) => `< ${inputs[0]}`,
@@ -118,7 +117,7 @@ exports.SystemPredicateDefs = [
         label: 'Positive',
         icon: { text: '>0' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Number(value) > 0,
     },
     {
@@ -126,7 +125,7 @@ exports.SystemPredicateDefs = [
         label: 'Negative',
         icon: { text: '<0' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Number(value) < 0,
     },
     {
@@ -134,7 +133,7 @@ exports.SystemPredicateDefs = [
         label: 'Zero',
         icon: { text: '=0' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => {
             if (typeof value === 'string' && !StringExtensions_1.default.IsNumeric(value)) {
                 return false;
@@ -147,7 +146,7 @@ exports.SystemPredicateDefs = [
         label: 'Equals',
         icon: { name: 'equal' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => {
             const input = inputs[0];
@@ -165,7 +164,7 @@ exports.SystemPredicateDefs = [
         label: 'Not Equals',
         icon: { name: 'not-equal' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => {
             const input = inputs[0];
@@ -183,7 +182,7 @@ exports.SystemPredicateDefs = [
         label: 'Between',
         icon: { text: 'BE' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'number' }, { type: 'number' }],
         handler: ({ value, inputs }) => Number(value) >= Number(inputs[0]) && Number(value) <= Number(inputs[1]),
         toString: ({ inputs }) => `Between ${inputs[0]}:${inputs[1]}`,
@@ -194,7 +193,7 @@ exports.SystemPredicateDefs = [
         label: 'Not Between',
         icon: { text: '!BE' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'number' }, { type: 'number' }],
         handler: ({ value, inputs }) => Number(value) < Number(inputs[0]) || Number(value) > Number(inputs[1]),
         toString: ({ inputs }) => `Not Between ${inputs[0]}:${inputs[1]}`,
@@ -222,7 +221,7 @@ exports.SystemPredicateDefs = [
         label: 'Equals',
         icon: { name: 'equal' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -241,7 +240,7 @@ exports.SystemPredicateDefs = [
         label: 'Not Equals',
         icon: { name: 'not-equal' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -260,7 +259,7 @@ exports.SystemPredicateDefs = [
         label: 'Contains',
         icon: { name: 'contains' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -278,7 +277,7 @@ exports.SystemPredicateDefs = [
         label: 'Not Contains',
         icon: { name: 'not-contains' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -296,7 +295,7 @@ exports.SystemPredicateDefs = [
         label: 'Starts With',
         icon: { name: 'starts-with' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -314,7 +313,7 @@ exports.SystemPredicateDefs = [
         label: 'Ends With',
         icon: { name: 'ends-with' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, api }) => {
             if (!value) {
@@ -332,7 +331,7 @@ exports.SystemPredicateDefs = [
         label: 'Regex',
         icon: { name: 'regex' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs }) => new RegExp(inputs[0]).test(value),
         toString: ({ inputs }) => `Regex ${inputs[0]}`,
@@ -343,7 +342,7 @@ exports.SystemPredicateDefs = [
         label: 'Today',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isToday_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -351,7 +350,7 @@ exports.SystemPredicateDefs = [
         label: 'Yesterday',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isYesterday_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -359,7 +358,7 @@ exports.SystemPredicateDefs = [
         label: 'Tomorrow',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isTomorrow_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -367,7 +366,7 @@ exports.SystemPredicateDefs = [
         label: 'This Week',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isThisWeek_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -375,7 +374,7 @@ exports.SystemPredicateDefs = [
         label: 'This Month',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isThisMonth_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -383,7 +382,7 @@ exports.SystemPredicateDefs = [
         label: 'This Quarter',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isThisQuarter_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -391,7 +390,7 @@ exports.SystemPredicateDefs = [
         label: 'This Year',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isThisYear_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -399,7 +398,7 @@ exports.SystemPredicateDefs = [
         label: 'In Past',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isPast_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -407,7 +406,7 @@ exports.SystemPredicateDefs = [
         label: 'In Future',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => (0, isFuture_1.default)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
@@ -415,7 +414,7 @@ exports.SystemPredicateDefs = [
         label: 'After',
         icon: { name: 'greater-than' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
         handler: ({ value, inputs }) => (0, isAfter_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
         toString: ({ inputs }) => `> ${inputs[0]}`,
@@ -425,7 +424,7 @@ exports.SystemPredicateDefs = [
         label: 'Before',
         icon: { name: 'less-than' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
         handler: ({ value, inputs }) => (0, isBefore_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
         toString: ({ inputs }) => `< ${inputs[0]}`,
@@ -435,7 +434,7 @@ exports.SystemPredicateDefs = [
         label: 'Equals',
         icon: { name: 'equal' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
         handler: ({ value, inputs }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
         toString: ({ inputs }) => `= ${inputs[0]}`,
@@ -445,7 +444,7 @@ exports.SystemPredicateDefs = [
         label: 'NotEquals',
         icon: { name: 'not-equal' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
         handler: ({ value, inputs }) => !(0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
         toString: ({ inputs }) => `!= ${inputs[0]}`,
@@ -455,16 +454,32 @@ exports.SystemPredicateDefs = [
         label: 'Next Work Day',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
-        handler: ({ value, api }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), CalendarHelper_1.default.getNextWorkingDay()),
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        handler: ({ value, api }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), api.calendarApi.getNextWorkingDay()),
     },
     {
         id: 'LastWorkDay',
         label: 'Last Work Day',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
-        handler: ({ value, api }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), CalendarHelper_1.default.getPreviousWorkingDay()),
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        handler: ({ value, api }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), api.calendarApi.getPreviousWorkingDay()),
+    },
+    {
+        id: 'WorkDay',
+        label: 'Working Day',
+        icon: { name: 'calendar' },
+        columnScope: { DataTypes: ['Date'] },
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        handler: ({ value, api }) => api.calendarApi.isWorkingDay(value),
+    },
+    {
+        id: 'Holiday',
+        label: 'Holiday',
+        icon: { name: 'calendar' },
+        columnScope: { DataTypes: ['Date'] },
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        handler: ({ value, api }) => api.calendarApi.isHoliday(value),
     },
     {
         id: 'InRange',
@@ -474,7 +489,6 @@ exports.SystemPredicateDefs = [
         moduleScope: ['filter'],
         inputs: [{ type: 'date' }, { type: 'date' }],
         handler: ({ value, inputs }) => new Date(value) >= new Date(inputs[0]) && new Date(value) <= new Date(inputs[1]),
-        // toString: ({ inputs }) => `From ${inputs[0]} To ${inputs[1]}`,
     },
     // Boolean System Filters
     {
@@ -482,7 +496,7 @@ exports.SystemPredicateDefs = [
         label: 'True',
         icon: { text: 'T' },
         columnScope: { DataTypes: ['Boolean'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Boolean(value) === true,
     },
     {
@@ -490,7 +504,7 @@ exports.SystemPredicateDefs = [
         label: 'False',
         icon: { text: 'F' },
         columnScope: { DataTypes: ['Boolean'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle', 'formatColumn'],
+        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Boolean(value) === false,
     },
     {

package/src/PredefinedConfig/StyledColumnState.d.ts

@@ -30,7 +30,7 @@ export interface StyledColumn extends SuspendableObject {
      */
     CheckBoxStyle?: boolean;
     /**
-     * Whether to Format the Column in Grouped Rows
+     * Includes the Styled Column in Grouped Rows
      * @defaultValue false
      */
     IncludeGroupedRows?: boolean;
@@ -39,14 +39,6 @@ export interface StyledColumn extends SuspendableObject {
  * Style used to display Percent Bars in Special Column Style
  */
 export interface PercentBarStyle extends NumericStyledColumn {
-    /**
-     * Ranges (e.g. to allow a traffic light effect)
-     */
-    CellRanges?: CellColorRange[];
-    /**
-     * Compares Cell values to another Column
-     */
-    ColumnComparison?: ColumnComparison;
     /**
      * Whether Cell shows Cell Value, Percent Value, both or none
      */
@@ -62,28 +54,24 @@ export interface PercentBarStyle extends NumericStyledColumn {
     BackColor?: string;
 }
 export interface NumericStyledColumn {
-    /**
-     * Specify what the range number represents.
-     *
-     * Number: can be any number, or Col-Min/Col-Max
-     * Percentage: can have only values between 0 and 100
-     *
-     * @defaults Number
-     */
-    RangeValueType?: 'Number' | 'Percentage';
-}
-/**
- * Used to display Gradient Styles in Special Column Style
- */
-export interface GradientStyle extends NumericStyledColumn {
     /**
      * Ranges (e.g. to allow a traffic light effect)
      */
     CellRanges?: CellColorRange[];
     /**
-     * Compares cell values to another Column
+     * Compares Cell values to another Column
      */
     ColumnComparison?: ColumnComparison;
+    /**
+     * Range can represent 'Number' (any number or Col-Min/Col-Max) or 'Percentage' (values 0-100)
+     * @defaultValue Number
+     */
+    RangeValueType?: RangeValueType;
+}
+/**
+ * Used to display Gradient Styles in Special Column Style
+ */
+export interface GradientStyle extends NumericStyledColumn {
 }
 /**
  * Defines which Colours to show in Gradient and Percent Bar Styles
@@ -131,3 +119,7 @@ export declare type CellTextOptions = CellTextOption[];
  * Text optionally to show in a Special Column Style special style: 'CellValue' or 'PercentageValue'
  */
 export declare type CellTextOption = 'CellValue' | 'PercentageValue';
+/**
+ * Whether the Range is Number or Percent based
+ */
+export declare type RangeValueType = 'Number' | 'Percentage';

package/src/Redux/ActionsReducers/PopupRedux.js

@@ -272,11 +272,19 @@ const PopupReducer = (state = initialState, action) => {
                 Title: showWindowAction.Title,
                 PopupProps: showWindowAction.PopupProps,
             };
+            let PopupList = [...state.WindowPopup.PopupList];
             // Prevent opening the same popup twice
             if (state.WindowPopup.PopupList.some((windowPopup) => windowPopup.Id === windowSettings.Id)) {
-                return state;
+                PopupList = PopupList.map((windowPopup) => {
+                    if (windowPopup.Id !== windowSettings.Id) {
+                        return windowPopup;
+                    }
+                    return Object.assign(Object.assign({}, windowPopup), windowSettings);
+                });
+            }
+            else {
+                PopupList = [...PopupList, windowSettings];
             }
-            const PopupList = [...state.WindowPopup.PopupList, windowSettings];
             return Object.assign(Object.assign({}, state), { WindowPopup: Object.assign(Object.assign({}, state.WindowPopup), { PopupList }) });
         }
         case exports.POPUP_HIDE_WINDOW: {

package/src/Strategy/FilterModule.js

@@ -117,9 +117,9 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             getCompactDeleteAction: LayoutRedux.LayoutColumnFilterClear,
             getDeleteAllAction: LayoutRedux.LayoutColumnFilterClearAll,
             emptyView: `
-        There are currently no column filters applied. \n
+        There are currently no Column Filters applied. \n
 
-        Create column filters by using the filter dropdown the Quick Filter Bar or the Filter Form in the Column Header Menu.
+        Create Column Filters by using the Filter Bar, the Filter Form (in the Column Header Menu) or by editing a Layout.
       `,
             getStatusBarPanelProps() {
                 let text;

package/src/Strategy/LayoutModule.d.ts

@@ -9,6 +9,8 @@ import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 export declare class LayoutModule extends AdaptableModuleBase implements IModule {
     protected LayoutState: LayoutState;
     constructor(api: AdaptableApi);
+    updateOldConfig(): void;
+    private clearUnsuportedFeaturesFromLayout;
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(layout: Layout): string[];
     getTeamSharingReferences(adaptableObject: AdaptableObject): TeamSharingReferences;
@@ -16,6 +18,7 @@ export declare class LayoutModule extends AdaptableModuleBase implements IModule
     handleAdaptableReady(): void;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    private createViewPivotItemsMenuItem;
     getTeamSharingAction(): TeamSharingImportInfo<Layout>;
     toViewAll(): {
         items: {

package/src/Strategy/LayoutModule.js

@@ -15,9 +15,40 @@ const LayoutWizard_1 = require("../View/Layout/Wizard/LayoutWizard");
 const getLayoutFilterViewItems_1 = require("./Utilities/Layout/getLayoutFilterViewItems");
 const getLayoutSortViewItems_1 = require("./Utilities/Layout/getLayoutSortViewItems");
 const AggregationColumns_1 = require("../PredefinedConfig/Common/AggregationColumns");
+const windowFactory_1 = require("../View/Components/Popups/WindowPopups/windowFactory");
+const flattenDeep_1 = tslib_1.__importDefault(require("lodash/flattenDeep"));
 class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, ModuleConstants.LayoutFriendlyName, 'layout', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
+        this.clearUnsuportedFeaturesFromLayout = (layout) => {
+            const layoutSupportedFeatures = this.api.layoutApi.getLayoutSupportedFeatures();
+            let needsUpdate = false;
+            const layoutToSave = Object.assign({}, layout);
+            if (!layoutSupportedFeatures.RowGroupedColumns && layout.RowGroupedColumns) {
+                delete layoutToSave.RowGroupedColumns;
+                needsUpdate = true;
+            }
+            if (!layoutSupportedFeatures.AggregationColumns && layout.AggregationColumns) {
+                delete layoutToSave.AggregationColumns;
+                needsUpdate = true;
+            }
+            if (!layoutSupportedFeatures.PivotColumns && layout.PivotColumns) {
+                delete layoutToSave.PivotColumns;
+                delete layoutToSave.EnablePivot;
+                needsUpdate = true;
+            }
+            if (!layoutSupportedFeatures.ColumnFilters && layout.ColumnFilters) {
+                delete layoutToSave.ColumnFilters;
+                needsUpdate = true;
+            }
+            if (!layoutSupportedFeatures.ColumnSorts && layout.ColumnSorts) {
+                delete layoutToSave.ColumnSorts;
+                needsUpdate = true;
+            }
+            if (needsUpdate) {
+                this.api.layoutApi.createOrUpdateLayout(layoutToSave);
+            }
+        };
         this.api.eventApi.on('LayoutChanged', (layoutChangedInfo) => {
             var _a;
             if (layoutChangedInfo.newLayoutState.CurrentLayout !==
@@ -27,6 +58,17 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
         });
     }
+    updateOldConfig() {
+        /**
+         * Viewport mode does not support a few
+         * features instead of complicating the
+         * logic where layout is applied, it is easier and
+         * less error prone to just remove it.
+         */
+        if (this.api.internalApi.getAdaptableInstance().getRowModel() === 'viewport') {
+            this.api.layoutApi.getAllLayout().forEach(this.clearUnsuportedFeaturesFromLayout);
+        }
+    }
     getModuleAdaptableObjects() {
         return this.api.layoutApi.getAllLayout();
     }
@@ -187,8 +229,77 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 });
             }
         }
+        const viewPivotItemsMenuItem = this.createViewPivotItemsMenuItem(menuContext);
+        if (viewPivotItemsMenuItem) {
+            returnColumnMenuItems.push(viewPivotItemsMenuItem);
+        }
         return returnColumnMenuItems;
     }
+    createViewPivotItemsMenuItem(menuContext) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        // current group => menuContext.rowNode.field;
+        if (((_b = (_a = menuContext.selectedCellInfo) === null || _a === void 0 ? void 0 : _a.gridCells) === null || _b === void 0 ? void 0 : _b.length) !== 1) {
+            return;
+        }
+        const currentLayout = this.api.layoutApi.getCurrentLayout();
+        if (!currentLayout.EnablePivot) {
+            return;
+        }
+        const { agGridColumn } = menuContext;
+        const columnId = agGridColumn.getColId();
+        const isPivotColumn = this.api.columnApi.isAutoPivotColumn(columnId);
+        if (!isPivotColumn && this.api.columnApi.getColumnDataTypeFromColumnId(columnId) !== 'Number') {
+            return;
+        }
+        /**
+         * Cannot base the values on the pivot column id, because the value or the field may have underscrores
+         *
+         *
+         * e.g. pivot_license_MIT License_stargazers_count
+         */
+        // pivot_status_Booked_price
+        // price
+        const aggColumn = (_f = (_e = (_d = (_c = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef) === null || _c === void 0 ? void 0 : _c.call(agGridColumn).pivotValueColumn) === null || _d === void 0 ? void 0 : _d.getColDef) === null || _e === void 0 ? void 0 : _e.call(_d)) === null || _f === void 0 ? void 0 : _f.field;
+        // Booked
+        const pivotValue = (_j = (_h = (_g = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef) === null || _g === void 0 ? void 0 : _g.call(agGridColumn)) === null || _h === void 0 ? void 0 : _h.pivotKeys) === null || _j === void 0 ? void 0 : _j[0];
+        // status - the preview works only with one column
+        const pivotColumnId = (_k = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.PivotColumns) === null || _k === void 0 ? void 0 : _k[0];
+        function getData(rows) {
+            return [
+                ...rows.map((row) => {
+                    if (row.childrenAfterFilter) {
+                        return getData(row.childrenAfterFilter);
+                    }
+                    return row.data;
+                }),
+            ];
+        }
+        const data = (0, flattenDeep_1.default)(getData(menuContext.rowNode.childrenAfterFilter));
+        const rowGroups = currentLayout.RowGroupedColumns;
+        const cellValue = isPivotColumn
+            ? menuContext.rowNode.aggData[columnId]
+            : menuContext.gridCell.displayValue;
+        const popupProps = {
+            hasPivotValue: isPivotColumn,
+            columnId,
+            rowGroups,
+            rows: data,
+            layout: currentLayout,
+            aggColumn,
+            pivotValue,
+            pivotColumnId,
+        };
+        return {
+            isVisible: true,
+            label: 'Expand Aggregated Value',
+            onClick: () => {
+                this.api.internalApi.showPopupWindow(windowFactory_1.SHOW_PIVOT_COLUMN_DETAILS, `Rows for Aggregated Value: ${cellValue}`, undefined, popupProps);
+            },
+            icon: {
+                name: 'arrowexpand',
+            },
+        };
+    }
     getTeamSharingAction() {
         return {
             ModuleEntities: this.api.layoutApi.getAllLayout(),
@@ -200,7 +311,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.getModuleAdaptableObjects().map((layout) => this.toView(layout));
     }
     toView(layout) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const maxColumnsToDisplay = (_d = (_c = (_b = (_a = this.api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.layoutOptions) === null || _b === void 0 ? void 0 : _b.layoutViewOptions) === null || _c === void 0 ? void 0 : _c.maxColumnsToDisplay) !== null && _d !== void 0 ? _d : 10;
         const columnIdToFriendlyName = (columnId) => {
             return this.api.columnApi.getFriendlyNameFromColumnId(columnId);
@@ -238,12 +349,12 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     values: columns,
                 },
                 ((_e = layout.ColumnSorts) === null || _e === void 0 ? void 0 : _e.length) && (0, getLayoutSortViewItems_1.getLayoutSortViewItems)(layout, this.api),
-                (layout === null || layout === void 0 ? void 0 : layout.ColumnFilters) && (0, getLayoutFilterViewItems_1.getLayoutFilterViewItems)(layout, this.api),
-                ((_f = layout === null || layout === void 0 ? void 0 : layout.RowGroupedColumns) === null || _f === void 0 ? void 0 : _f.length) && {
+                ((_f = layout === null || layout === void 0 ? void 0 : layout.ColumnFilters) === null || _f === void 0 ? void 0 : _f.length) && (0, getLayoutFilterViewItems_1.getLayoutFilterViewItems)(layout, this.api),
+                ((_g = layout === null || layout === void 0 ? void 0 : layout.RowGroupedColumns) === null || _g === void 0 ? void 0 : _g.length) && {
                     name: 'Grouped Columns',
                     values: layout.RowGroupedColumns.map((colId) => columnIdToFriendlyName(colId)),
                 },
-                ((_g = layout === null || layout === void 0 ? void 0 : layout.PivotColumns) === null || _g === void 0 ? void 0 : _g.length) && {
+                ((_h = layout === null || layout === void 0 ? void 0 : layout.PivotColumns) === null || _h === void 0 ? void 0 : _h.length) && {
                     name: 'Pivot Columns',
                     values: layout.PivotColumns.map((colId) => columnIdToFriendlyName(colId)),
                 },

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -142,7 +142,6 @@ exports.DefaultAdaptableOptions = {
         dataSets: GeneralConstants_1.EMPTY_ARRAY,
         showGroupingTotalsAsHeader: false,
         alternativeModuleNames: undefined,
-        currentCalendar: 'United Kingdom',
         cellSummaryOperations: undefined,
         customSortComparers: undefined,
         englishVariant: 'GB',