@adaptabletools/adaptable 20.2.0 → 20.2.2

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

@@ -1 +1 @@
-import{LicenseDisablePersistence as e,LicenseShowWatermark as a}from"../../../Redux/ActionsReducers/InternalRedux";import{PopupShowAlert as t}from"../../../Redux/ActionsReducers/PopupRedux";import i from"../../ObjectFactory";import s from"lodash/clamp";import{LicenseDocsLink as o}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",p=10,d=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 h=()=>"undefined"!=typeof window?window.location.origin:"",E=()=>{const e=h(),[a,t,i]=Array.from(/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g.exec(e)||[]);return"https"===t&&"sandpack.codesandbox.io"===i},I=()=>{const e=h(),[a,t,i]=Array.from(/(https):\/\/\S+(\.csb\.app)/g.exec(e)||[]);return"https"===t&&".csb.app"===i},_=()=>{const e=h(),[a,t,i]=Array.from(/(https):\/\/\S+(\.adaptabletools\.com)/g.exec(e)||[]);return"https"===t&&".adaptabletools.com"===i};export class LicenseService{constructor(e,a,t){this.adaptable=e,this.licenseKey=a,this.packageDetails=t,this.adaptable=e,this.adaptable.api.eventApi.on("AdaptableReady",(()=>{requestAnimationFrame((()=>{this.adaptable.isDestroyed||this.init()}))}))}init(){let e=null;if(this.licenseKey)try{e=n(this.licenseKey)}catch(a){e=a}E()||I()||_()||this.handleLicenseValidation(e,this.getValidityType(e,this.packageDetails))}getValidityType(e,a){if(!e)return LicenseValidityType.NO_LICENSE;if(e instanceof Error)return LicenseValidityType.INVALID_LICENSE;const t=new Date(a.publishedAt),i=new Date(e.end),s=i<new Date,o=e.trial;let n=null;return n=s?i>t?o?LicenseValidityType.NON_PRODUCTION_EXPIRED_IN_SCOPE:LicenseValidityType.COMMERCIAL_EXPIRED_IN_SCOPE:o?LicenseValidityType.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:LicenseValidityType.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:o?LicenseValidityType.NON_PRODUCTION_VALID:LicenseValidityType.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){const t=new Date;t.setHours(0,0,0,0);let i=0;e instanceof Error||!e?.end||(i=Math.floor((e?.end?.getTime()-t.getTime())/d),i=s(i,0,1/0));let n="",h="";!e||e instanceof Error||!e.appName||e.appName==r||(n=e.appName,h=" for application [APP_NAME]");const E=(e,a=o,t=c,s=i,r=n)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",r).replace("[DAYS]",`${s}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(E("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(E("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(E("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(E("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(i<=p)this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{l()&&this.adaptable.logger.consoleLogByMessageType(E(`Thank you for using a valid AdapTable license${h}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} 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(E(`This AdapTable license${h} 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:i.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction(a(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction(e())}destroy(){}}
+import{LicenseDisablePersistence as e,LicenseShowWatermark as a}from"../../../Redux/ActionsReducers/InternalRedux";import{PopupShowAlert as t}from"../../../Redux/ActionsReducers/PopupRedux";import i from"../../ObjectFactory";import s from"lodash/clamp";import{LicenseDocsLink as o}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",p=10,d=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 h=()=>"undefined"!=typeof window?window.location.origin:"",E=()=>{const e=h(),[a,t,i]=Array.from(/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g.exec(e)||[]);return"https"===t&&"sandpack.codesandbox.io"===i},I=()=>{const e=h(),[a,t,i]=Array.from(/(https):\/\/\S+(\.csb\.app)/g.exec(e)||[]);return"https"===t&&".csb.app"===i},_=()=>{const e=h(),[a,t,i]=Array.from(/(https):\/\/\S+(\.adaptabletools\.com)/g.exec(e)||[]);return"https"===t&&".adaptabletools.com"===i};export class LicenseService{constructor(e,a,t){this.adaptable=e,this.licenseKey=a,this.packageDetails=t,this.adaptable=e,this.adaptable.api.eventApi.on("AdaptableReady",()=>{requestAnimationFrame(()=>{this.adaptable.isDestroyed||this.init()})})}init(){let e=null;if(this.licenseKey)try{e=n(this.licenseKey)}catch(a){e=a}E()||I()||_()||this.handleLicenseValidation(e,this.getValidityType(e,this.packageDetails))}getValidityType(e,a){if(!e)return LicenseValidityType.NO_LICENSE;if(e instanceof Error)return LicenseValidityType.INVALID_LICENSE;const t=new Date(a.publishedAt),i=new Date(e.end),s=i<new Date,o=e.trial;let n=null;return n=s?i>t?o?LicenseValidityType.NON_PRODUCTION_EXPIRED_IN_SCOPE:LicenseValidityType.COMMERCIAL_EXPIRED_IN_SCOPE:o?LicenseValidityType.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:LicenseValidityType.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:o?LicenseValidityType.NON_PRODUCTION_VALID:LicenseValidityType.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){const t=new Date;t.setHours(0,0,0,0);let i=0;e instanceof Error||!e?.end||(i=Math.floor((e?.end?.getTime()-t.getTime())/d),i=s(i,0,1/0));let n="",h="";!e||e instanceof Error||!e.appName||e.appName==r||(n=e.appName,h=" for application [APP_NAME]");const E=(e,a=o,t=c,s=i,r=n)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",r).replace("[DAYS]",`${s}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(E("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(E("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(E("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(E("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(i<=p)this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{l()&&this.adaptable.logger.consoleLogByMessageType(E(`Thank you for using a valid AdapTable license${h}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} 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(E(`This AdapTable license${h} 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:i.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction(a(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction(e())}destroy(){}}

package/src/Utilities/license/decode.js

@@ -1 +1 @@
-import{compute_string as e}from"./hashing";const t=()=>new Error("Invalid License");export const GENERIC_APP_NAME="GenericAdaptableApp";export const fieldsToLicenseDetails=e=>{const r=e.reduce(((e,t)=>(e.set(t.name,t.value),e)),new Map),a={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:r.get("Ref")??""};if(!(a.start&&a.end&&a.owner&&"boolean"==typeof a.trial&&a.ref))throw t();return a};export const decode=r=>{let a="",n=r.split("|").map((e=>{let[t,r]=e.split("=");return"C"===t&&(a=r),{name:t,value:r}}));if(!a)throw t();const o=a.split(",").reverse(),s=o.pop();o.forEach(((r,a)=>{const o=n[a];if(e(o.value)!==r)throw t()}));const p=[...n];p.pop();const i=p.map((e=>`${e.name}=${e.value}`)).join("|");if(e(i)!==s)throw t();return n=n.map((e=>({...e,value:decodeURI(e.value)}))),fieldsToLicenseDetails(n)};
+import{compute_string as e}from"./hashing";const t=()=>new Error("Invalid License");export const GENERIC_APP_NAME="GenericAdaptableApp";export const fieldsToLicenseDetails=e=>{const r=e.reduce((e,t)=>(e.set(t.name,t.value),e),new Map),a={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:r.get("Ref")??""};if(!(a.start&&a.end&&a.owner&&"boolean"==typeof a.trial&&a.ref))throw t();return a};export const decode=r=>{let a="",n=r.split("|").map(e=>{let[t,r]=e.split("=");return"C"===t&&(a=r),{name:t,value:r}});if(!a)throw t();const o=a.split(",").reverse(),s=o.pop();o.forEach((r,a)=>{const o=n[a];if(e(o.value)!==r)throw t()});const p=[...n];p.pop();const i=p.map(e=>`${e.name}=${e.value}`).join("|");if(e(i)!==s)throw t();return n=n.map(e=>({...e,value:decodeURI(e.value)})),fieldsToLicenseDetails(n)};

package/src/View/CalculatedColumn/Wizard/CalculatedColumnExpressionWizardSection.js

@@ -52,9 +52,7 @@ export const CalculatedColumnExpressionWizardSection = (props) => {
                 return 'quantileAggregatedScalar';
         }
     };
-    const columns = api.columnApi
-        .getQueryableColumns()
-        .filter((c) => !c.isGeneratedPivotResultColumn);
+    const columns = api.columnApi.internalApi.getQueryableColumnsForUIEditor();
     return (React.createElement(Tabs, { autoFocus: false, height: "100%" },
         React.createElement(Tabs.Tab, null, Humanize(props.expressionType)),
         React.createElement(Tabs.Content, null, (() => {

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

@@ -147,13 +147,13 @@ export const EntityRulesEditor = (props) => {
                 React.createElement(EntityRulePredicatesEditor, { enablePredicateColumnId: props.enablePredicateColumnId, data: data, descriptions: descriptions, predicateDefs: filteredPredicateDefs, getPredicateDefsForColId: props.getPredicateDefsForColId, onChange: props.onChange }))) : null,
             showBoolean ? (React.createElement(QueryTab, { showRadio: showRadioButtons, value: "BooleanExpression", type: type, label: "Boolean" })) : null,
             showBoolean ? (React.createElement(Tabs.Content, { "data-name": "BooleanExpression", value: 'BooleanExpression' }, (() => {
-                const editor = (React.createElement(ExpressionEditor, { type: 'boolean', module: module, value: data.Rule?.BooleanExpression, onChange: setBooleanExpression, initialData: initialData, columns: api.columnApi.getQueryableColumns(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api, showQueryBuilder: props.showQueryBuilder }));
+                const editor = (React.createElement(ExpressionEditor, { type: 'boolean', module: module, value: data.Rule?.BooleanExpression, onChange: setBooleanExpression, initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api, showQueryBuilder: props.showQueryBuilder }));
                 return props.showQueryBuilder ? React.createElement(Panel, null, editor) : editor;
             })())) : null,
             showObservable ? (React.createElement(QueryTab, { showRadio: showRadioButtons, value: "ObservableExpression", type: type, label: "Observable" })) : null,
             showObservable ? (React.createElement(Tabs.Content, { "data-name": "ObservableExpression", value: 'ObservableExpression' },
-                React.createElement(ExpressionEditor, { type: 'observable', module: module, value: data.Rule?.ObservableExpression, onChange: setReactiveExpression, initialData: initialData, columns: api.columnApi.getQueryableColumns(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }))) : null,
+                React.createElement(ExpressionEditor, { type: 'observable', module: module, value: data.Rule?.ObservableExpression, onChange: setReactiveExpression, initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }))) : null,
             showAggregation ? (React.createElement(QueryTab, { showRadio: showRadioButtons, value: "AggregatedBooleanExpression", type: type, label: "Aggregated Boolean" })) : null,
             showAggregation ? (React.createElement(Tabs.Content, { "data-name": "AggregatedBooleanExpression", value: 'AggregatedBooleanExpression' },
-                React.createElement(ExpressionEditor, { type: 'aggregatedBoolean', module: module, value: data.Rule?.AggregatedBooleanExpression, onChange: setAggregationExpression, initialData: initialData, columns: api.columnApi.getQueryableColumns(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }))) : null)));
+                React.createElement(ExpressionEditor, { type: 'aggregatedBoolean', module: module, value: data.Rule?.AggregatedBooleanExpression, onChange: setAggregationExpression, initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }))) : null)));
 };

package/src/View/Components/ExpressionWizard.js

@@ -27,7 +27,7 @@ export class ExpressionWizard extends React.Component {
     render() {
         const initialData = useMemo(() => this.props.api.internalApi.getQueryPreviewData(), []);
         return (React.createElement(React.Fragment, null,
-            React.createElement(ExpressionEditor, { type: 'boolean', module: NamedQueryModuleId, value: this.state.expression, onChange: this.handleCustomExpressionChange, initialData: initialData, columns: this.props.api.columnApi.getQueryableColumns(), fields: this.props.api.expressionApi.internalApi.getAvailableFields(), namedQueries: this.props.api.namedQueryApi.getNamedQueries(), api: this.props.api }),
+            React.createElement(ExpressionEditor, { type: 'boolean', module: NamedQueryModuleId, value: this.state.expression, onChange: this.handleCustomExpressionChange, initialData: initialData, columns: this.props.api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: this.props.api.expressionApi.internalApi.getAvailableFields(), namedQueries: this.props.api.namedQueryApi.getNamedQueries(), api: this.props.api }),
             ' ',
             React.createElement(Flex, { flexDirection: "row", padding: 1, marginBottom: 2, marginLeft: 1, alignItems: "center", "data-name": "expression-wizard-save-option" },
                 React.createElement(CheckBox, { marginLeft: 2, disabled: !this.isValidExpression(), marginBottom: 2, checked: this.state.saveToNamedQueries, onChange: (checked) => this.setState({

package/src/View/Components/StyleComponent.d.ts

@@ -8,6 +8,7 @@ export interface StyleComponentProps extends React.ClassAttributes<StyleComponen
     api: AdaptableApi;
     headless?: boolean;
     hidePreview?: boolean;
+    headerText?: string;
     Style: AdaptableStyle;
     showFontSizeAs?: 'radio' | 'dropdown';
     UpdateStyle: (style: AdaptableStyle) => void;

package/src/View/Components/StyleComponent.js

@@ -44,10 +44,11 @@ export class StyleComponent extends React.Component {
     }
     render() {
         const Cmp = this.props.headless ? Box : Panel;
+        const headerText = this.props.headerText ?? 'Style';
         const cmpProps = this.props.headless
             ? {}
             : {
-                header: 'Style',
+                header: headerText,
                 margin: 2,
                 'data-name': 'style-component',
             };

package/src/View/Export/Wizard/ReportRowsWizardSection.js

@@ -70,5 +70,5 @@ export const ReportRowsWizardSection = (props) => {
                                 BooleanExpression,
                             },
                         });
-                    }, initialData: initialData, columns: api.columnApi.getQueryableColumns(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api })))));
+                    }, initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api })))));
 };

package/src/View/GridFilter/GridFilterExpressionEditor.js

@@ -88,7 +88,7 @@ export const GridFilterExpressionEditor = (props) => {
             },
         } },
         React.createElement(Flex, { height: "100%", flexDirection: "column" },
-            React.createElement(ExpressionEditor, { ...expressionEditorProps, type: 'boolean', module: GridFilterModuleId, value: expression, onChange: (expression) => setExpression(expression), initialData: initialData, columns: api.columnApi.getQueryableColumns(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }),
+            React.createElement(ExpressionEditor, { ...expressionEditorProps, type: 'boolean', module: GridFilterModuleId, value: expression, onChange: (expression) => setExpression(expression), initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }),
             React.createElement(Flex, { flexDirection: "row", padding: 1, alignItems: "center" },
                 props.onDismiss && (React.createElement(SimpleButton, { margin: 1, variant: "text", "data-name": "action-close", onClick: () => {
                         props.onDismiss();

package/src/View/Layout/Wizard/sections/ColumnsSection.js

@@ -22,6 +22,7 @@ import { ReorderDraggable } from '../../../Components/ReorderDraggable';
 import { AdaptableFormControlTextClear } from '../../../Components/Forms/AdaptableFormControlTextClear';
 import { sortColumnIdsByOrder } from '../../../../layout-manager/src/sortColumnIdsByOrder';
 import HelpBlock from '../../../../components/HelpBlock';
+import { AG_GRID_SELECTION_COLUMN } from '../../../../Utilities/Constants/GeneralConstants';
 const PropertyOrderText = (props) => (React.createElement(Text, { fontWeight: 600, fontSize: 2 }, props.children));
 const columnTypes = {
     default: {
@@ -195,6 +196,7 @@ export const ColumnsSection = (props) => {
     const adaptable = useAdaptable();
     const { data: layout } = useOnePageAdaptableWizardContext();
     const [searchInputValue, setSearchInputValue] = React.useState('');
+    let hasSelectionColumn = false;
     const allColumns = adaptable.api.columnApi
         .getUIAvailableColumns()
         .filter((col) => {
@@ -204,7 +206,23 @@ export const ColumnsSection = (props) => {
         return !col.isGeneratedRowGroupColumn;
     })
         // if the current Layout is a PivotLayout, then we also filter out current Pivot Result Columns
-        .filter((col) => !col.isGeneratedPivotResultColumn);
+        .filter((col) => !col.isGeneratedPivotResultColumn)
+        // also we need to filter out selection column
+        .filter((col) => {
+        const result = !col.isGeneratedSelectionColumn;
+        if (!result) {
+            hasSelectionColumn = true;
+        }
+        return result;
+    });
+    const onChange = (data) => {
+        if (hasSelectionColumn &&
+            Array.isArray(data.TableColumns) &&
+            !data.TableColumns.includes(AG_GRID_SELECTION_COLUMN)) {
+            data.TableColumns.unshift(AG_GRID_SELECTION_COLUMN);
+        }
+        props.onChange(data);
+    };
     // however, changes in RowGroupedColumns done in the previous step
     // are reflected into the layout, so we use the latest layout.RowGroupedColumns
     // to create new columns
@@ -261,7 +279,7 @@ export const ColumnsSection = (props) => {
                 ColumnVisibility[colId] = false;
             }
         });
-        props.onChange({
+        onChange({
             ...layout,
             TableColumns: columnIds,
             ColumnVisibility,
@@ -300,14 +318,14 @@ export const ColumnsSection = (props) => {
                 return shouldInclude;
             });
         }
-        props.onChange({
+        onChange({
             ...layout,
             TableColumns: TableColumns,
             ColumnVisibility,
         });
     };
     const handlePinChange = (columnId, pinning) => {
-        props.onChange({
+        onChange({
             ...layout,
             ColumnPinning: {
                 ...layout.ColumnPinning,
@@ -316,7 +334,7 @@ export const ColumnsSection = (props) => {
         });
     };
     const handleColumnNameChange = (columnId, headerName) => {
-        props.onChange({
+        onChange({
             ...layout,
             ColumnHeaders: {
                 ...layout.ColumnHeaders,
@@ -325,7 +343,7 @@ export const ColumnsSection = (props) => {
         });
     };
     const handleColumnWidthChange = (columnId, width) => {
-        props.onChange({
+        onChange({
             ...layout,
             ColumnWidths: {
                 ...layout.ColumnWidths,
@@ -334,7 +352,8 @@ export const ColumnsSection = (props) => {
         });
     };
     const visibleIds = layout.TableColumns.filter((colId) => {
-        return layout.ColumnVisibility?.[colId] !== false;
+        return (layout.ColumnVisibility?.[colId] !== false &&
+            adaptable.api.columnApi.isSelectionColumn(colId) === false);
     });
     const toLabel = (colId) => adaptable.api.columnApi.getFriendlyNameForColumnId(colId, layout);
     const toIdentifier = (colId) => colId;
@@ -373,7 +392,7 @@ export const ColumnsSection = (props) => {
                 noSelectionLabel: `No Columns Selected`,
                 onChange: handleColumnsChange,
                 onSelectAll: () => {
-                    props.onChange({
+                    onChange({
                         ...layout,
                         ColumnVisibility: {},
                         TableColumns: ColumnOrderAllColumns.map((col) => col.columnId),

package/src/View/Layout/Wizard/sections/GridFilterSection.js

@@ -32,6 +32,6 @@ export const GridFilterSection = (props) => {
                     Expression: expression,
                 },
             });
-        }, initialData: initialData, columns: api.columnApi.getQueryableColumns().filter((c) => !c.isGeneratedPivotResultColumn), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }));
+        }, initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }));
     return React.createElement("div", null, expressionEditorContent);
 };

package/src/View/Layout/Wizard/sections/RowGroupingSection.js

@@ -19,8 +19,8 @@ export const RowGroupingSectionSummary = () => {
             React.createElement(Tag, null, "Row Grouping is not available in Tree Grids")));
     }
     return (React.createElement(Box, { display: 'flex', flexDirection: 'row' }, layout.RowGroupedColumns?.length ? (layout.RowGroupedColumns.map((columnId) => {
-        return (React.createElement(Box, { mb: 2, mr: 2 },
-            React.createElement(Tag, { key: columnId }, adaptable.api.columnApi.getFriendlyNameForColumnId(columnId))));
+        return (React.createElement(Box, { key: columnId, mb: 2, mr: 2 },
+            React.createElement(Tag, null, adaptable.api.columnApi.getFriendlyNameForColumnId(columnId))));
     })) : (React.createElement(Tag, null, "No Row Grouping"))));
 };
 export const RowGroupBehaviorSection = (props) => {
@@ -39,8 +39,8 @@ export const RowGroupBehaviorSection = (props) => {
                 }
                 onChange(newLayout);
             } },
-            React.createElement(TypeRadio, { value: "always-collapsed", text: "All Collapsed", description: "Always open Layout with all Grouped Rows collapsed" }),
-            React.createElement(TypeRadio, { value: "always-expanded", text: "All Expanded", description: "Always open Layout with all Grouped Rows expanded" }),
+            React.createElement(TypeRadio, { value: "always-collapsed", text: "All Collapsed", description: "Layout opens with all Grouped Rows always collapsed" }),
+            React.createElement(TypeRadio, { value: "always-expanded", text: "All Expanded", description: "Layout opens with all Grouped Rows always expanded" }),
             React.createElement(TypeRadio, { value: "expanded", text: "Mostly Expanded", description: "Layout opens with all Grouped rows expanded, other than those collapsed when Layout last displayed" }),
             React.createElement(TypeRadio, { value: "collapsed", text: "Mostly Collapsed", description: "Layout opens with all Grouped rows collapsed, other than those expanded when Layout last displayed" }))));
 };

package/src/View/License/LicenseWatermark.js

@@ -1 +1 @@
-import*as e from"react";import{Logo as t}from"../../components/Logo";import{Flex as r}from"rebass";const o={border:"1px solid var(--ab-color-error)",padding:"5px",fontWeight:600,margin:"5px",fontSize:"14px",alignItems:"center",color:"var(--ab-color-text-on-defaultbackground)",background:"var(--ab-color-defaultbackground)"},n=e=>{const t=[["display","none"],["opacity","0"],["position","absolute"],["position","fixed"],["position","relative"],["visibility","hidden"]];for(const[r,o]of t)if(e.style[r]===o)return!1;return!0};export const LicenseWatermark=i=>{const l=e.useRef(null);return e.useEffect((()=>{const e=setInterval((()=>{l.current?.isConnected||alert("It is not allowed to remove the Adaptable watermark."),n(l.current)||alert("It is not allowed to modify the Adaptable watermark."),l?.current?.style&&(l.current.style.border=o.border,l.current.style.padding=o.padding,l.current.style.fontWeight=`${o.fontWeight}`,l.current.style.margin=o.margin,l.current.style.fontSize=o.fontSize,l.current.style.color=o.color,l.current.style.background=o.background,l.current.style.display="flex",l.current.style.position="static",l.current.style.opacity="1",l.current.style.visibility="visible")}),5e3);return()=>clearTimeout(e)}),[]),e.createElement(r,{style:o,ref:l},e.createElement(t,{style:{marginRight:10}}),e.createElement("div",null,i.children))};
+import*as e from"react";import{Logo as t}from"../../components/Logo";import{Flex as r}from"rebass";const o={border:"1px solid var(--ab-color-error)",padding:"5px",fontWeight:600,margin:"5px",fontSize:"14px",alignItems:"center",color:"var(--ab-color-text-on-defaultbackground)",background:"var(--ab-color-defaultbackground)"},n=e=>{const t=[["display","none"],["opacity","0"],["position","absolute"],["position","fixed"],["position","relative"],["visibility","hidden"]];for(const[r,o]of t)if(e.style[r]===o)return!1;return!0};export const LicenseWatermark=i=>{const l=e.useRef(null);return e.useEffect(()=>{const e=setInterval(()=>{l.current?.isConnected||alert("It is not allowed to remove the Adaptable watermark."),n(l.current)||alert("It is not allowed to modify the Adaptable watermark."),l?.current?.style&&(l.current.style.border=o.border,l.current.style.padding=o.padding,l.current.style.fontWeight=`${o.fontWeight}`,l.current.style.margin=o.margin,l.current.style.fontSize=o.fontSize,l.current.style.color=o.color,l.current.style.background=o.background,l.current.style.display="flex",l.current.style.position="static",l.current.style.opacity="1",l.current.style.visibility="visible")},5e3);return()=>clearTimeout(e)},[]),e.createElement(r,{style:o,ref:l},e.createElement(t,{style:{marginRight:10}}),e.createElement("div",null,i.children))};

package/src/View/NamedQuery/Wizard/NamedQueryExpressionWizardSection.js

@@ -26,5 +26,5 @@ export const NamedQueryExpressionWizardSection = (props) => {
     const initialData = useMemo(() => api.internalApi.getQueryPreviewData(), []);
     return (React.createElement(ExpressionEditor, { allowSaveNamedQuery: false, showQueryBuilder: true, type: 'boolean', module: moduleInfo.ModuleName, value: data.BooleanExpression, onChange: (BooleanExpression) => {
             props.onChange({ ...data, BooleanExpression });
-        }, initialData: initialData, columns: api.columnApi.getQueryableColumns(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }));
+        }, initialData: initialData, columns: api.columnApi.internalApi.getQueryableColumnsForUIEditor(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), api: api }));
 };

package/src/View/QuickSearch/QuickSearchInput.js

@@ -12,11 +12,12 @@ export const QuickSearchInput = (props) => {
     const QuickSearchText = useSelector((state) => state.QuickSearch.QuickSearchText);
     const dispatch = useDispatch();
     const onRunQuickSearch = React.useCallback((newQuickSearchText) => dispatch(QuickSearchRedux.QuickSearchRun(newQuickSearchText)), []);
+    const isServerSideRowModel = adaptable.api.gridApi.getAgGridRowModelType() === 'serverSide';
     const [searchText, search] = useQuickSearchDebounced({
         QuickSearchText,
         onRunQuickSearch,
     });
-    return (React.createElement(AdaptableFormControlTextClear, { "aria-label": 'Quick Search', type: "text", autoFocus: props.autoFocus, placeholder: adaptable.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, className: join('ab-DashboardToolbar__QuickSearch__text', props.className), value: searchText, OnTextChange: search, style: { height: '100%' }, inputStyle: { width: props.width ?? '10rem' }, actionTools: React.createElement(Box, { display: "flex", flexDirection: "row", alignItems: "center", flex: 'none' },
+    return (React.createElement(AdaptableFormControlTextClear, { "aria-label": 'Quick Search', type: "text", autoFocus: props.autoFocus, placeholder: adaptable.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, className: join('ab-DashboardToolbar__QuickSearch__text', props.className), value: searchText, OnTextChange: search, style: { height: '100%' }, inputStyle: { width: props.width ?? '10rem' }, actionTools: isServerSideRowModel ? null : (React.createElement(Box, { display: "flex", flexDirection: "row", alignItems: "center", flex: 'none' },
             React.createElement(SimpleButton, { "aria-label": 'Previous Match', icon: "arrow-up", px: 0, py: 0, mr: 1, disabled: !searchText, variant: "text", onClick: () => adaptable.api.quickSearchApi.gotoPreviousMatch() }),
-            React.createElement(SimpleButton, { "aria-label": 'Next Match', icon: "arrow-down", px: 0, py: 0, mr: 1, disabled: !searchText, variant: "text", onClick: () => adaptable.api.quickSearchApi.gotoNextMatch() })) }));
+            React.createElement(SimpleButton, { "aria-label": 'Next Match', icon: "arrow-down", px: 0, py: 0, mr: 1, disabled: !searchText, variant: "text", onClick: () => adaptable.api.quickSearchApi.gotoNextMatch() }))) }));
 };

package/src/View/QuickSearch/QuickSearchPopup.d.ts

@@ -6,7 +6,7 @@ interface QuickSearchPopupProps extends ModuleViewPopupProps<any> {
     QuickSearchText: string;
     QuickSearchStyle: AdaptableStyle;
     onRunQuickSearch: (quickSearchText: string) => QuickSearchRedux.QuickSearchRunAction;
-    onSetStyle: (style: AdaptableStyle) => QuickSearchRedux.QuickSearchSetStyleAction;
+    onSetMatchingCellStyle: (style: AdaptableStyle) => QuickSearchRedux.QuickSearchSetMatchingCellStyleAction;
 }
 export declare const QuickSearchPopup: import("react-redux").ConnectedComponent<(props: QuickSearchPopupProps) => React.JSX.Element, {
     [x: string]: any;

package/src/View/QuickSearch/QuickSearchPopup.js

@@ -11,6 +11,7 @@ import { CheckBox } from '../../components/CheckBox';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 import { useQuickSearchDebounced } from './useQuickSearchDebounced';
 import { QuickSearchInput } from './QuickSearchInput';
+import HelpBlock from '../../components/HelpBlock';
 const QuickSearchPopupComponent = (props) => {
     const [searchText, search] = useQuickSearchDebounced(props);
     const [state, setState] = useState({
@@ -19,7 +20,7 @@ const QuickSearchPopupComponent = (props) => {
     });
     const onUpdateStyle = (style) => {
         setState({ ...state, EditedStyle: style });
-        props.onSetStyle(style);
+        props.onSetMatchingCellStyle(style);
     };
     const onQuickSearchBehaviourChange = (checked) => {
         setState({ ...state, RunQueryAfterQuickSearch: checked });
@@ -33,21 +34,23 @@ const QuickSearchPopupComponent = (props) => {
         React.createElement(Panel, { header: props.api.internalApi.getCorrectEnglishVariant('Behaviour'), style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginLeft: 2, marginRight: 2 },
             ' ',
             React.createElement(Flex, { flexDirection: "column" },
+                React.createElement(HelpBlock, { fontSize: 2, marginTop: 2, marginBottom: 2 }, "Filters the Grid to only show rows with matching cells; use with care as can cause performance issues"),
+                ' ',
                 React.createElement(FormLayout, { columns: [1, 2] },
                     React.createElement(FormRow, null,
                         React.createElement(CheckBox, { "data-name": "filter-quick-search-results", value: "existing", marginLeft: 1, marginRight: 3, checked: state.RunQueryAfterQuickSearch, disabled: StringExtensions.IsNotNullOrEmpty(searchText), onChange: onQuickSearchBehaviourChange }, "Filter using Quick Search Results"))))),
-        React.createElement(StyleComponent, { style: { height: '100%' }, api: props.api, Style: props.QuickSearchStyle, UpdateStyle: onUpdateStyle })));
+        React.createElement(StyleComponent, { style: { height: '100%' }, headerText: 'Cell Matching Style', api: props.api, Style: props.QuickSearchStyle, UpdateStyle: onUpdateStyle })));
 };
 function mapStateToProps(state, ownProps) {
     return {
         QuickSearchText: state.QuickSearch.QuickSearchText,
-        QuickSearchStyle: state.QuickSearch.Style,
+        QuickSearchStyle: state.QuickSearch.CellMatchStyle,
     };
 }
 function mapDispatchToProps(dispatch) {
     return {
         onRunQuickSearch: (quickSearchText) => dispatch(QuickSearchRedux.QuickSearchRun(quickSearchText)),
-        onSetStyle: (style) => dispatch(QuickSearchRedux.QuickSearchSetStyle(style)),
+        onSetMatchingCellStyle: (style) => dispatch(QuickSearchRedux.QuickSearchSetCellMatchingStyle(style)),
     };
 }
 export const QuickSearchPopup = connect(mapStateToProps, mapDispatchToProps)(QuickSearchPopupComponent);

package/src/agGrid/AdaptableAgGrid.js

@@ -90,7 +90,7 @@ import { weightedAverage } from '../Utilities/weightedAverage';
 import { ROW_SUMMARY_ROW_ID } from '../AdaptableState/Common/RowSummary';
 import { FlashingCellService } from '../Utilities/Services/FlashingCellService';
 import { AgGridExportAdapter } from './AgGridExportAdapter';
-import { checkForDuplicateColumns, isPivotLayout, layoutModelToLayoutState, layoutStateToLayoutModel, normalizeLayout, } from '../Api/Implementation/LayoutHelpers';
+import { checkForDuplicateColumns, getLayoutRowGroupValuesExceptionGroupKeys, isPivotLayout, layoutModelToLayoutState, layoutStateToLayoutModel, normalizeLayout, } from '../Api/Implementation/LayoutHelpers';
 import { LayoutManager } from '../layout-manager/src';
 import { isPivotLayoutModel } from '../layout-manager/src/isPivotLayoutModel';
 import { ACTION_COLUMN_TYPE, CALCULATED_COLUMN_TYPE, FDC3_COLUMN_TYPE, FREE_TEXT_COLUMN_TYPE, PIVOT_AGGREGATION_TOTAL_COLUMN_TYPE, PIVOT_ANY_TOTAL_COLUMN_TYPE, PIVOT_COLUMN_TOTAL_COLUMN_TYPE, PIVOT_GRAND_TOTAL_COLUMN_TYPE, } from '../AdaptableState/Common/AdaptableColumn';
@@ -449,7 +449,7 @@ export class AdaptableAgGrid {
             this.updateColumnModelAndRefreshGrid();
         }
         const layoutModelForApply = layoutStateToLayoutModel(currentLayout);
-        this.layoutManager.applyRowGroupValues(layoutModelForApply.RowGroupValues);
+        this.layoutManager.applyRowGroupValues(layoutModelForApply.RowGroupValues, layoutModelForApply.RowGroupedColumns);
         this.layoutManager.applyColumnGroupCollapseExpandState(layoutModelForApply);
         this.autoSizeLayoutIfNeeded();
         this.ModuleService.createModuleUIItems();
@@ -1322,12 +1322,12 @@ You need to define at least one Layout!`);
             this.autoSizeLayoutIfNeeded();
         }));
         /**
-         * Use Case: A format column that has ColumnGroupState needs to be re-evaluated
+         * Use Case: A format column that has ColumnGroupScope needs to be re-evaluated
          * whenever a column group is expanded or collapsed
          */
         this.agGridAdapter.getAgGridApi().addEventListener('columnGroupOpened', (this.listenerColumnGroupOpened = () => {
             if (this.api.formatColumnApi.getActiveFormatColumns().some((fc) => {
-                return fc.ColumnGroupState != null;
+                return fc.ColumnGroupScope != null;
             })) {
                 this.updateColumnModelAndRefreshGrid();
             }
@@ -2014,7 +2014,7 @@ You need to define at least one Layout!`);
             layout = this.api.layoutApi.getCurrentLayout();
         }
         const layoutModel = layoutStateToLayoutModel(layout);
-        this.layoutManager.applyRowGroupValues(layoutModel.RowGroupValues);
+        this.layoutManager.applyRowGroupValues(layoutModel.RowGroupValues, layoutModel.RowGroupedColumns);
     }
     isGroupRowNode(rowNode) {
         if (!rowNode) {
@@ -3107,12 +3107,23 @@ You need to define at least one Layout!`);
         checkForDuplicateColumns(layout);
         const isLayoutSwitch = this._prevLayout && layout.Name != this._prevLayout.Name;
         let shouldUpdateExpandState = isLayoutSwitch;
-        if (!isLayoutSwitch &&
-            this._prevLayout &&
-            layout.RowGroupValues?.RowGroupDefaultBehavior &&
-            this._prevLayout?.RowGroupValues?.RowGroupDefaultBehavior !=
-                layout.RowGroupValues?.RowGroupDefaultBehavior) {
-            shouldUpdateExpandState = true;
+        if (!isLayoutSwitch && this._prevLayout) {
+            if (layout.RowGroupValues?.RowGroupDefaultBehavior &&
+                this._prevLayout?.RowGroupValues?.RowGroupDefaultBehavior !=
+                    layout.RowGroupValues?.RowGroupDefaultBehavior) {
+                shouldUpdateExpandState = true;
+            }
+            else {
+                const prevLayoutExceptionGroupKeys = getLayoutRowGroupValuesExceptionGroupKeys(this._prevLayout)
+                    .flat()
+                    .join(',');
+                const currentLayoutExceptionGroupKeys = getLayoutRowGroupValuesExceptionGroupKeys(layout)
+                    .flat()
+                    .join(',');
+                if (prevLayoutExceptionGroupKeys !== currentLayoutExceptionGroupKeys) {
+                    shouldUpdateExpandState = true;
+                }
+            }
         }
         this._prevLayout = layout;
         const perfSetLayout = this.logger.beginPerf(`setLayout(${layout.Name})`);

package/src/agGrid/AgGridAdapter.js

@@ -425,6 +425,7 @@ export class AgGridAdapter {
         const isFdc3MainActionColumn = this.adaptableApi.fdc3Api.internalApi.isFdc3MainActionColumn(colId);
         let friendlyName;
         const isGeneratedRowGroupColumn = columnApi.isAutoRowGroupColumn(ColumnId);
+        const isGeneratedSelectionColumn = columnApi.isSelectionColumn(ColumnId);
         const isGeneratedPivotResultColumn = columnApi.isPivotResultColumn(ColumnId) && !agGridColumn.isPrimary();
         const colExists = columnApi.doesColumnExist(ColumnId) ||
             isGeneratedRowGroupColumn ||
@@ -464,7 +465,7 @@ export class AgGridAdapter {
             colDef.lockVisible === true &&
             colDef.suppressColumnsToolPanel === true &&
             colDef.suppressFiltersToolPanel === true;
-        const isGenerated = isGeneratedRowGroupColumn || isGeneratedPivotResultColumn;
+        const isGenerated = isGeneratedRowGroupColumn || isGeneratedPivotResultColumn || isGeneratedSelectionColumn;
         const abColumn = {
             Uuid: createUuid(),
             isTreeColumn,
@@ -491,6 +492,7 @@ export class AgGridAdapter {
             hideable: this.isColumnHideable(colDef),
             isGrouped: isGenerated ? false : this.isColumnRowGrouped(colDef),
             isGeneratedRowGroupColumn,
+            isGeneratedSelectionColumn,
             isGeneratedPivotResultColumn,
             isFixed: this.isColumnFixed(colDef),
             pinned: this.getColumnPinnedPosition(colDef),
@@ -676,6 +678,9 @@ export class AgGridAdapter {
             this.adaptableApi.columnApi.isAutoRowGroupColumn(colDef.colId)) {
             return false;
         }
+        if (this.adaptableApi.columnApi.isSelectionColumn(colDef.colId)) {
+            return false;
+        }
         if (colDef.lockVisible != null && colDef.lockVisible == true) {
             return false;
         }

package/src/agGrid/AgGridColumnAdapter.d.ts

@@ -36,6 +36,7 @@ export declare class AgGridColumnAdapter {
     private setupColumnValueSetter;
     private setupColumnComparator;
     private setupColumnGetFindText;
+    private getCellSearchText;
     private isCellSearchable;
     private isQuickSearchActive;
     private getEditableCellClass;

package/src/agGrid/AgGridColumnAdapter.js

@@ -1,3 +1,4 @@
+import kebabCase from 'lodash/kebabCase';
 import merge from 'lodash/merge';
 import { FilterWrapperFactory } from './FilterWrapper';
 import { FloatingFilterWrapperFactory } from './FloatingFilterWrapper';
@@ -87,12 +88,16 @@ export class AgGridColumnAdapter {
     }
     shouldSkipColumn(colId) {
         /**
-         * This skips columns like `ag-Grid-SelectionColumn` and possibly other columns
-         * that ag grid will implement in the future
+         * This skips special columns that ag grid will likely implement in the future
          *
-         * BUT DOES NOT SKIP GROUP COLUMNS!!!
+         * BUT DOES NOT SKIP GROUP COLUMNS or SELECTION COLUMNS!!!
+         *
+         * It's probably here for historical reasons - previously it used to skip the selection column
+         * but now it's not skipping it anymore
          */
-        return colId.startsWith('ag-Grid-') && !this.adaptableApi.columnApi.isAutoRowGroupColumn(colId);
+        return (colId.startsWith('ag-Grid-') &&
+            !this.adaptableApi.columnApi.isAutoRowGroupColumn(colId) &&
+            !this.adaptableApi.columnApi.isSelectionColumn(colId));
     }
     setupColumns() {
         const pivotMode = this.agGridApi.isPivotMode();
@@ -152,10 +157,8 @@ export class AgGridColumnAdapter {
     setupColumnCellClass({ col, colId, abColumn }) {
         this.setColDefProperty(col, 'cellClass', (userCellClass) => {
             const formatColumns = this.adaptableApi.formatColumnApi.internalApi.getFormatColumnWithStyleClassNameForColumn(abColumn);
-            const quickSearchStyleClassName = this.adaptableApi.quickSearchApi.getQuickSearchStyle().ClassName;
             const quickSearchTextMatchStyle = this.getQuickSearchTextMatchStyle();
             const quickSearchCurrentTextMatchStyle = this.getQuickSearchCurrentTextMatchStyle();
-            const hasQuickSearchStyleClassName = StringExtensions.IsNotNullOrEmpty(quickSearchStyleClassName);
             const cellClass = (params) => {
                 const gridCell = this.adaptableApi.gridApi.getGridCellFromRowNode(params.node, abColumn.columnId);
                 if (!gridCell.column) {
@@ -182,7 +185,7 @@ export class AgGridColumnAdapter {
                     !hasStyledColumn && formatColumns.length
                         ? this.getFormatColumnCellClass(formatColumns, abColumn, params)
                         : null,
-                    isQuickSearchActive && hasQuickSearchStyleClassName ? quickSearchStyleClassName : null,
+                    //  isQuickSearchActive && hasQuickSearchStyleClassName ? quickSearchStyleClassName : null,
                     isQuickSearchActive && (quickSearchTextMatchStyle || quickSearchCurrentTextMatchStyle)
                         ? 'ab-QuickSearchFind'
                         : null,
@@ -210,15 +213,17 @@ export class AgGridColumnAdapter {
             const quickSearchCurrentTextMatchStyle = this.getQuickSearchCurrentTextMatchStyle();
             const textMatchStyle = quickSearchTextMatchStyle
                 ? Object.entries(quickSearchTextMatchStyle).reduce((acc, [key, value]) => {
+                    // needed as AG-Grid vanilla turns all CSS props
+                    // to kebab, while AG Grid React does not
                     // @ts-ignore
-                    acc[`--ab-dynamic-${key}`] = value;
+                    acc[`--ab-dynamic-${kebabCase(key)}`] = value;
                     return acc;
                 }, {})
                 : undefined;
             const currentTextMatchStyle = quickSearchCurrentTextMatchStyle
                 ? Object.entries(quickSearchCurrentTextMatchStyle).reduce((acc, [key, value]) => {
                     // @ts-ignore
-                    acc[`--ab-dynamic-${key}`] = value;
+                    acc[`--ab-dynamic-${kebabCase(key)}`] = value;
                     return acc;
                 }, {})
                 : undefined;
@@ -685,18 +690,25 @@ export class AgGridColumnAdapter {
                 }
                 const getCellSearchText = this.adaptableOptions.quickSearchOptions.getCellSearchText;
                 if (getCellSearchText) {
-                    const quickSearchValue = this.adaptableApi.quickSearchApi.getQuickSearchValue();
-                    const quickSearchContext = {
-                        ...this.adaptableApi.internalApi.buildBaseContext(),
-                        gridCell,
-                        quickSearchValue,
-                    };
-                    return getCellSearchText(quickSearchContext);
+                    return this.getCellSearchText(gridCell);
                 }
                 return userGetFindText?.(params) ?? gridCell.displayValue;
             };
         });
     }
+    getCellSearchText(gridCell) {
+        const getCellSearchText = this.adaptableOptions.quickSearchOptions.getCellSearchText;
+        if (getCellSearchText) {
+            const quickSearchValue = this.adaptableApi.quickSearchApi.getQuickSearchValue();
+            const quickSearchContext = {
+                ...this.adaptableApi.internalApi.buildBaseContext(),
+                gridCell,
+                quickSearchValue,
+            };
+            return getCellSearchText(quickSearchContext);
+        }
+        return gridCell.displayValue;
+    }
     isCellSearchable(gridCell) {
         const isCellSearchableFn = this.adaptableOptions.quickSearchOptions.isCellSearchable;
         if (!gridCell.column) {
@@ -732,6 +744,16 @@ export class AgGridColumnAdapter {
         if (!column) {
             return false;
         }
+        const isServerSideRowModel = this.adaptableApi.gridApi.getAgGridRowModelType() === 'serverSide';
+        if (isServerSideRowModel) {
+            const isCaseSensitive = this.adaptableOptions.quickSearchOptions.isQuickSearchCaseSensitive;
+            const cellDisplayValue = String(this.getCellSearchText(gridCell));
+            const displayValue = isCaseSensitive
+                ? cellDisplayValue
+                : cellDisplayValue.toLocaleLowerCase();
+            const searchText = isCaseSensitive ? quickSearchValue : quickSearchValue.toLocaleLowerCase();
+            return displayValue.indexOf(searchText) !== -1;
+        }
         return (this.agGridApi.findGetNumMatches({
             column,
             node: gridCell.rowNode,
@@ -828,7 +850,7 @@ export class AgGridColumnAdapter {
         return classNames;
     }
     getQuickSearchCellStyle() {
-        const quickSearchStyle = this.adaptableApi.quickSearchApi.getQuickSearchStyle();
+        const quickSearchStyle = this.adaptableApi.quickSearchApi.getQuickSearchCellMatchStyle();
         if (!quickSearchStyle || StringExtensions.IsNotNullOrEmpty(quickSearchStyle.ClassName)) {
             return undefined;
         }