@adaptabletools/adaptable 21.0.0-canary.7 → 21.0.0

package/src/View/Components/ColumnFilter/ColumnFilter.js

@@ -6,6 +6,7 @@ import { usePredicateDef } from './hooks';
 import Radio from '../../../components/Radio';
 import { useAdaptable } from '../../AdaptableContext';
 import { Select } from '../../../components/Select';
+import { mapQlPredicateToAdaptablePredicate } from './utils';
 const ColumnFilterPredicateDropdown = (props) => {
     const predicateDef = usePredicateDef(props.predicate?.operator, props.predicateDefs);
     const options = props.predicateDefs.map((predicateDef) => {
@@ -78,6 +79,10 @@ export const ColumnFilterComponent = (props) => {
             setPredicateNotYetApplied(predicate);
         }
     };
+    const clearAllFilters = () => {
+        props.onPredicateChange(null);
+        setPredicateNotYetApplied(undefined);
+    };
     const onNewPredicate = (predicateDef) => {
         const currentPredicate = currentPredicateRef.current;
         const newPredicate = {
@@ -111,10 +116,29 @@ export const ColumnFilterComponent = (props) => {
             variant: 'raised',
             children: 'Add Condition',
         } }));
+    const isAtLeastOneColumnFilterValid = (qlPredicates) => {
+        if (!qlPredicates?.length) {
+            return false;
+        }
+        return qlPredicates
+            .map((qlPredicate) => mapQlPredicateToAdaptablePredicate(qlPredicate))
+            .some((adaptablePredicate) => adaptable.api.predicateApi.isValidPredicate(adaptablePredicate));
+    };
     return (React.createElement(React.Fragment, null,
-        React.createElement(Flex, { m: 2 },
-            React.createElement(AndOrInput, { onChange: onCombineChange, operator: currentPredicate.operator }),
-            React.createElement(SimpleButton, { ml: 2, onClick: () => onPredicateChange(null) }, "Clear All")),
+        React.createElement(Flex, { flexDirection: "column", backgroundColor: "primarylight", pb: !props.hideActionButtons ? 2 : undefined, mb: props.location === 'filterForm' ? 2 : undefined, mt: props.location === 'columnMenu' ? 2 : undefined, ml: props.location === 'columnMenu' ? 2 : undefined, mr: props.location === 'columnMenu' ? 2 : undefined, style: { borderRadius: 'var(--ab__border-radius)' } },
+            React.createElement(Flex, { m: 2 },
+                React.createElement(AndOrInput, { onChange: onCombineChange, operator: currentPredicate.operator })),
+            !props.hideActionButtons && (React.createElement(Flex, { ml: 2, mr: 2, className: "ab-ColumnFilter-actions", justifyContent: "space-between" },
+                React.createElement(Box, { className: "ab-ColumnFilter-action-clearall" },
+                    React.createElement(SimpleButton, { "aria-label": 'Clear All Filters', onClick: () => clearAllFilters() }, "Clear All")),
+                manuallyApplyColumnFilter ? (React.createElement(React.Fragment, null,
+                    React.createElement(Box, { flex: 1, "data-name": "spacer" }),
+                    React.createElement(Box, { className: "ab-ColumnFilter-action-reset", mr: 2 },
+                        React.createElement(SimpleButton, { "aria-label": 'Reset All', tone: "neutral", variant: "raised", onClick: () => {
+                                setPredicateNotYetApplied(props.predicate);
+                            } }, "Reset")),
+                    React.createElement(Box, { className: "ab-ColumnFilter-action-apply" },
+                        React.createElement(SimpleButton, { "aria-label": 'Apply Filter', tone: "accent", variant: "raised", onClick: applyFilter, disabled: !isAtLeastOneColumnFilterValid(predicateNotYetApplied?.args) && !isAtLeastOneColumnFilterValid(currentPredicate.args) }, "Apply")))) : null))),
         React.createElement(Flex, { flexDirection: "column", className: "ab-ColumnFilter", flex: 1, minHeight: 0, ...props.wrapperProps },
             React.createElement(Box, { style: { overflow: 'auto' } },
                 currentPredicate.args.map((predicate, index) => {
@@ -140,14 +164,5 @@ export const ColumnFilterComponent = (props) => {
                             });
                         } }));
                 }),
-                isLastPredicateValid && filterPredicateDropdown),
-            manuallyApplyColumnFilter ? (React.createElement(React.Fragment, null,
-                React.createElement(Box, { flex: 1, "data-name": "spacer" }),
-                React.createElement(Flex, { pt: 2, className: "ab-ColumnFilter-actions", justifyContent: "space-between" },
-                    React.createElement(Box, { className: "ab-ColumnFilter-action-apply" },
-                        React.createElement(SimpleButton, { tone: "accent", variant: "raised", onClick: applyFilter }, "Apply Filter")),
-                    React.createElement(Box, { className: "ab-ColumnFilter-action-reset" },
-                        React.createElement(SimpleButton, { tone: "neutral", variant: "raised", onClick: () => {
-                                setPredicateNotYetApplied(props.predicate);
-                            } }, "Reset Filter"))))) : null)));
+                isLastPredicateValid && filterPredicateDropdown))));
 };

package/src/View/Components/ColumnFilter/ColumnFilterWindow.js

@@ -29,5 +29,5 @@ export const ColumnFilterWindow = (props) => {
                             }
                             return label;
                         }, onChange: (column) => setColumnId(column), filterColumn: (column) => column.queryable, isMulti: false, value: columnId })))),
-        React.createElement(AdaptableColumnFilter, { columnId: columnId })));
+        React.createElement(AdaptableColumnFilter, { columnId: columnId, location: 'filterForm' })));
 };

package/src/View/Components/ColumnFilter/LayoutColumnFilter.js

@@ -21,5 +21,5 @@ export const LayoutColumnFilter = (props) => {
         };
         props.onColumnFilterChange(newFilter);
     };
-    return (React.createElement(ColumnFilterComponent, { columnId: props.columnFilter.ColumnId, predicate: qlPredicate, predicateDefs: qlPredicateDefs, disabled: props.columnFilter?.IsSuspended, onPredicateChange: handlePredicateChange }));
+    return (React.createElement(ColumnFilterComponent, { location: 'filterForm', columnId: props.columnFilter.ColumnId, predicate: qlPredicate, predicateDefs: qlPredicateDefs, disabled: props.columnFilter?.IsSuspended, onPredicateChange: handlePredicateChange, hideActionButtons: true }));
 };

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

@@ -108,7 +108,7 @@ export const EntityRulesEditor = (props) => {
         }
     };
     const filteredPredicateDefs = predicateDefs.filter((def) => {
-        if (api.predicateApi.internalApi.IsInorNotInPredicateDef(def)) {
+        if (api.predicateApi.internalApi.IsInOrNotInPredicateDef(def)) {
             return 'ColumnIds' in data.Scope && data.Scope.ColumnIds.length === 1;
         }
         return true;

package/src/View/Components/PredicateEditor/PredicateEditor.js

@@ -79,7 +79,7 @@ export const PredicateEditor = (props) => {
             index > 0 && React.createElement(HelpBlock, { margin: 2 }, "AND"),
             React.createElement(Flex, { key: index, flex: 1, flexDirection: "column" },
                 React.createElement(AdaptableInput, { "data-name": `predicate-input-${index}`, marginTop: 2, type: predicateDefInput.type, autoFocus: index === 0, value: props.predicate.Inputs?.[index] ?? '', onChange: (e) => handlePredicateInputChange(e, index) })))))),
-        adaptable.api.predicateApi.internalApi.IsInorNotInPredicateDef(currentPredicateDef) && (React.createElement(Box, { mt: 2 },
+        adaptable.api.predicateApi.internalApi.IsInOrNotInPredicateDef(currentPredicateDef) && (React.createElement(Box, { mt: 2 },
             React.createElement(ColumnValuesSelect, { isLoading: isDistinctColumnValuesLoading, column: column, options: quickFilterValues.values, selectProps: {
                     onMenuOpen,
                     onInputChange,

package/src/agGrid/AgGridFilterAdapter.js

@@ -37,6 +37,7 @@ export const AgGridFilterAdapterFactory = (adaptable) => {
                 this.unmountReactRoot = adaptable.renderReactRoot(renderWithAdaptableContext(React.createElement(AdaptableColumnFilter, {
                     columnId,
                     wrapperProps: { p: 2 },
+                    location: 'columnMenu',
                 }), adaptable), this.filterContainer);
             }
         }

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1757331083218 || Date.now(),
-    VERSION: "21.0.0-canary.7" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1757490972135 || Date.now(),
+    VERSION: "21.0.0" || '--current-version--',
 };

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

@@ -3021,33 +3021,6 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
-    DefaultLayoutProperties: {
-        name: string;
-        kind: string;
-        desc: string;
-        props: {
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-            ref: string;
-        }[];
-    };
-    DefaultLayoutPropertiesContext: {
-        name: string;
-        kind: string;
-        desc: string;
-        props: {
-            name: string;
-            kind: string;
-            desc: string;
-        }[];
-    };
-    DefaultPivotLayoutProperties: {
-        name: string;
-        kind: string;
-        desc: string;
-    };
     DefaultPredicateFilterContext: {
         name: string;
         kind: string;
@@ -3064,11 +3037,6 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
-    DefaultTableLayoutProperties: {
-        name: string;
-        kind: string;
-        desc: string;
-    };
     DetailInitContext: {
         name: string;
         kind: string;
@@ -4249,6 +4217,28 @@ export declare const ADAPTABLE_METAMODEL: {
             ref?: undefined;
         })[];
     };
+    LayoutCreationDefaultProperties: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref: string;
+        }[];
+    };
+    LayoutCreationDefaultPropertiesContext: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+        }[];
+    };
     LayoutExtendedConfig: {
         name: string;
         kind: string;
@@ -4707,6 +4697,11 @@ export declare const ADAPTABLE_METAMODEL: {
             ref?: undefined;
         })[];
     };
+    PivotLayoutCreationDefaultProperties: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     PivotPreviewColumnsContext: {
         name: string;
         kind: string;
@@ -5895,6 +5890,11 @@ export declare const ADAPTABLE_METAMODEL: {
             ref?: undefined;
         })[];
     };
+    TableLayoutCreationDefaultProperties: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     TeamSharingOptions: {
         name: string;
         kind: string;