npm - @adaptabletools/adaptable - Versions diffs - 17.0.0-canary.0 → 17.0.0-canary.2 - Mend

@adaptabletools/adaptable 17.0.0-canary.0 → 17.0.0-canary.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (399) hide show

package/src/PredefinedConfig/Common/AdaptablePredicate.js CHANGED Viewed

@@ -24,7 +24,7 @@ export const SystemPredicateDefs = [
         label: 'Values',
         icon: { text: 'IN' },
         columnScope: { DataTypes: ['String', 'Number', 'Date'] },
-        moduleScope: ['filter', 'formatColumn', 'alert', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'flashingcell', 'formatColumn', 'alert', 'badgeStyle'],
         handler: ({ inputs, column, value, adaptableApi }) => {
             if (inputs.length === 0) {
                 return true;
@@ -34,7 +34,7 @@ export const SystemPredicateDefs = [
             }
             if (column.dataType === 'Date') {
                 return inputs.some((input) => {
-                    if (adaptableApi.optionsApi.getColumnFilterOptions().filterUsingTime) {
+                    if (adaptableApi.optionsApi.getColumnFilterOptions().valuesFilterOptions.filterValuesUsingTime) {
                         return isEqual(input, value);
                     }
                     else {
@@ -64,7 +64,7 @@ export const SystemPredicateDefs = [
         label: 'Exclude Values',
         icon: { text: '!IN' },
         columnScope: { DataTypes: ['String', 'Number', 'Date'] },
-        moduleScope: ['filter', 'formatColumn', 'alert', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'flashingcell', 'formatColumn', 'alert', 'badgeStyle'],
         handler: ({ inputs, column, value, adaptableApi }) => {
             // basically negation of IN
             if (inputs.length === 0) {
@@ -74,7 +74,7 @@ export const SystemPredicateDefs = [
                 return false;
             }
             if (column.dataType === 'Date') {
-                if (adaptableApi.optionsApi.getColumnFilterOptions().filterUsingTime) {
+                if (adaptableApi.optionsApi.getColumnFilterOptions().valuesFilterOptions.filterValuesUsingTime) {
                     return inputs.every((input) => {
                         return !isEqual(input, value);
                     });
@@ -106,7 +106,7 @@ export const SystemPredicateDefs = [
         label: 'Blanks',
         icon: { name: 'unfilled-circle' },
         columnScope: { All: true },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         handler: ({ value }) => Helper.isInputNullOrEmpty(value),
     },
     {
@@ -114,7 +114,7 @@ export const SystemPredicateDefs = [
         label: 'Non Blanks',
         icon: { name: 'filled-circle' },
         columnScope: { All: true },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         handler: ({ value }) => Helper.isInputNotNullOrEmpty(value),
     },
     // Numeric System Filters
@@ -123,7 +123,7 @@ export const SystemPredicateDefs = [
         label: 'Greater Than',
         icon: { name: 'greater-than' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => Number(value) > Number(inputs[0]),
         toString: ({ inputs }) => `> ${inputs[0]}`,
@@ -134,7 +134,7 @@ export const SystemPredicateDefs = [
         label: 'Less Than',
         icon: { name: 'less-than' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => Number(value) < Number(inputs[0]),
         toString: ({ inputs }) => `< ${inputs[0]}`,
@@ -145,7 +145,7 @@ export const SystemPredicateDefs = [
         label: 'Positive',
         icon: { text: '>0' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         handler: ({ value }) => Number(value) > 0,
     },
     {
@@ -153,7 +153,7 @@ export const SystemPredicateDefs = [
         label: 'Negative',
         icon: { text: '<0' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         handler: ({ value }) => Number(value) < 0,
     },
     {
@@ -161,7 +161,7 @@ export const SystemPredicateDefs = [
         label: 'Zero',
         icon: { text: '=0' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         handler: ({ value }) => {
             if (typeof value === 'string' && !StringExtensions.IsNumeric(value)) {
                 return false;
@@ -177,7 +177,7 @@ export const SystemPredicateDefs = [
         label: 'Equals',
         icon: { name: 'equals' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => {
             const input = inputs[0];
@@ -195,7 +195,7 @@ export const SystemPredicateDefs = [
         label: 'Not Equals',
         icon: { name: 'not-equal' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'number' }],
         handler: ({ value, inputs }) => {
             const input = inputs[0];
@@ -213,7 +213,7 @@ export const SystemPredicateDefs = [
         label: 'Between',
         icon: { text: 'BE' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         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]}`,
@@ -224,7 +224,7 @@ export const SystemPredicateDefs = [
         label: 'Not Between',
         icon: { text: '!BE' },
         columnScope: { DataTypes: ['Number'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         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]}`,
@@ -252,7 +252,7 @@ export const SystemPredicateDefs = [
         label: 'Equals',
         icon: { name: 'equals' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, adaptableApi }) => {
             if (!value) {
@@ -271,7 +271,7 @@ export const SystemPredicateDefs = [
         label: 'Not Equals',
         icon: { name: 'not-equal' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, adaptableApi }) => {
             if (!value) {
@@ -290,7 +290,7 @@ export const SystemPredicateDefs = [
         label: 'Contains',
         icon: { name: 'contains' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, adaptableApi }) => {
             if (!value) {
@@ -308,7 +308,7 @@ export const SystemPredicateDefs = [
         label: 'Not Contains',
         icon: { name: 'not-contains' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, adaptableApi }) => {
             if (!value) {
@@ -326,7 +326,7 @@ export const SystemPredicateDefs = [
         label: 'Starts With',
         icon: { name: 'starts-with' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, adaptableApi }) => {
             if (!value) {
@@ -344,7 +344,7 @@ export const SystemPredicateDefs = [
         label: 'Ends With',
         icon: { name: 'ends-with' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs, adaptableApi }) => {
             if (!value) {
@@ -362,7 +362,7 @@ export const SystemPredicateDefs = [
         label: 'Regex',
         icon: { name: 'regex' },
         columnScope: { DataTypes: ['String'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
         inputs: [{ type: 'text' }],
         handler: ({ value, inputs }) => new RegExp(inputs[0]).test(value),
         toString: ({ inputs }) => `Regex ${inputs[0]}`,
@@ -373,7 +373,7 @@ export const SystemPredicateDefs = [
         label: 'Today',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => isToday(parseDateValue(value)),
     },
     {
@@ -381,7 +381,7 @@ export const SystemPredicateDefs = [
         label: 'Yesterday',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => isYesterday(parseDateValue(value)),
     },
     {
@@ -389,7 +389,7 @@ export const SystemPredicateDefs = [
         label: 'Tomorrow',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => isTomorrow(parseDateValue(value)),
     },
     {
@@ -397,7 +397,7 @@ export const SystemPredicateDefs = [
         label: 'This Week',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => isThisWeek(parseDateValue(value)),
     },
     {
@@ -405,7 +405,7 @@ export const SystemPredicateDefs = [
         label: 'This Month',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => isThisMonth(parseDateValue(value)),
     },
     {
@@ -413,7 +413,7 @@ export const SystemPredicateDefs = [
         label: 'This Quarter',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => isThisQuarter(parseDateValue(value)),
     },
     {
@@ -421,7 +421,7 @@ export const SystemPredicateDefs = [
         label: 'This Year',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => isThisYear(parseDateValue(value)),
     },
     {
@@ -429,7 +429,7 @@ export const SystemPredicateDefs = [
         label: 'In Past',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => isPast(parseDateValue(value)),
     },
     {
@@ -437,7 +437,7 @@ export const SystemPredicateDefs = [
         label: 'In Future',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => isFuture(parseDateValue(value)),
     },
     {
@@ -445,7 +445,7 @@ export const SystemPredicateDefs = [
         label: 'After',
         icon: { name: 'greater-than' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
         handler: ({ value, inputs }) => isAfter(parseDateValue(value), parseDateValue(inputs[0])),
         toString: ({ inputs }) => `> ${inputs[0]}`,
@@ -455,7 +455,7 @@ export const SystemPredicateDefs = [
         label: 'Before',
         icon: { name: 'less-than' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
         handler: ({ value, inputs }) => isBefore(parseDateValue(value), parseDateValue(inputs[0])),
         toString: ({ inputs }) => `< ${inputs[0]}`,
@@ -465,7 +465,7 @@ export const SystemPredicateDefs = [
         label: 'Equals',
         icon: { name: 'equals' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
         handler: ({ value, inputs }) => isSameDay(parseDateValue(value), parseDateValue(inputs[0])),
         toString: ({ inputs }) => `= ${inputs[0]}`,
@@ -475,7 +475,7 @@ export const SystemPredicateDefs = [
         label: 'NotEquals',
         icon: { name: 'not-equal' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
         handler: ({ value, inputs }) => !isSameDay(parseDateValue(value), parseDateValue(inputs[0])),
         toString: ({ inputs }) => `!= ${inputs[0]}`,
@@ -485,7 +485,7 @@ export const SystemPredicateDefs = [
         label: 'Next Work Day',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value, adaptableApi }) => isSameDay(parseDateValue(value), adaptableApi.calendarApi.getNextWorkingDay()),
     },
     {
@@ -493,7 +493,7 @@ export const SystemPredicateDefs = [
         label: 'Last Work Day',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value, adaptableApi }) => isSameDay(parseDateValue(value), adaptableApi.calendarApi.getPreviousWorkingDay()),
     },
     {
@@ -501,7 +501,7 @@ export const SystemPredicateDefs = [
         label: 'Working Day',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value, adaptableApi }) => adaptableApi.calendarApi.isWorkingDay(value),
     },
     {
@@ -509,7 +509,7 @@ export const SystemPredicateDefs = [
         label: 'Holiday',
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value, adaptableApi }) => adaptableApi.calendarApi.isHoliday(value),
     },
     {
@@ -517,7 +517,7 @@ export const SystemPredicateDefs = [
         label: 'Range',
         icon: { name: 'date-range' },
         columnScope: { DataTypes: ['Date'] },
-        moduleScope: ['filter'],
+        moduleScope: ['columnFilter'],
         inputs: [{ type: 'date' }, { type: 'date' }],
         handler: ({ value, inputs }) => new Date(value) >= new Date(inputs[0]) && new Date(value) <= new Date(inputs[1]),
     },
@@ -527,7 +527,7 @@ export const SystemPredicateDefs = [
         label: 'True',
         icon: { text: 'T' },
         columnScope: { DataTypes: ['Boolean'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Boolean(value) === true,
     },
     {
@@ -535,7 +535,7 @@ export const SystemPredicateDefs = [
         label: 'False',
         icon: { text: 'F' },
         columnScope: { DataTypes: ['Boolean'] },
-        moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
+        moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Boolean(value) === false,
     },
     {
@@ -543,7 +543,7 @@ export const SystemPredicateDefs = [
         label: 'BooleanToggle',
         icon: { name: 'boolean-list' },
         columnScope: { DataTypes: ['Boolean'] },
-        moduleScope: ['filter'],
+        moduleScope: ['columnFilter'],
         inputs: [{ type: 'boolean' }],
         // working with string aliases instead of booleans because the ColumnFilterAPI cannot handle falsy filter values (it ignores them)
         handler: ({ value, inputs }) => {
@@ -557,7 +557,7 @@ export const SystemPredicateDefs = [
     },
     // Other System Filters
     {
-        id: 'Any',
+        id: 'AnyChange',
         label: 'Any Change',
         columnScope: { All: true },
         moduleScope: ['alert', 'flashingcell'],
@@ -576,19 +576,6 @@ export const SystemPredicateDefs = [
             return (change / base) * 100 > threshold;
         },
     },
-    {
-        id: 'PrimaryKeyDuplicate',
-        label: 'Primary Key Duplicate',
-        columnScope: { All: true },
-        moduleScope: ['alert'],
-        handler: ({ value, column, adaptableApi, node }) => {
-            return (column === null || column === void 0 ? void 0 : column.isPrimaryKey)
-                ? adaptableApi.gridApi.internalApi
-                    .getDistinctRawValuesForColumn(column.columnId, node)
-                    .includes(value)
-                : false;
-        },
-    },
     {
         id: 'ExistingValuesOnly',
         label: 'Existing Values Only',
@@ -634,7 +621,7 @@ export const SystemPredicateDefs = [
         },
     },
 ];
-export const SystemFilterPredicateIds = SystemPredicateDefs.filter((p) => p.moduleScope.includes('filter')).map((p) => p.id);
+export const SystemFilterPredicateIds = SystemPredicateDefs.filter((p) => p.moduleScope.includes('columnFilter')).map((p) => p.id);
 export const SystemAlertPredicateIds = SystemPredicateDefs.filter((p) => p.moduleScope.includes('alert')).map((p) => p.id);
 export const SystemFormatColumnPredicateIds = SystemPredicateDefs.filter((p) => p.moduleScope.includes('formatColumn')).map((p) => p.id);
 export const SystemFlashingCellPredicateIds = SystemPredicateDefs.filter((p) => p.moduleScope.includes('flashingcell')).map((p) => p.id);

package/src/PredefinedConfig/Common/AdaptableQuery.d.ts CHANGED Viewed

@@ -47,5 +47,5 @@ export interface AdaptableAggregatedScalarQuery {
 /**
  * An AdaptableQuery can be either a Boolean, Scalar, Observable, AggregatedBoolean, or AggregatedScalar expression
  */
-export declare type AdaptableQuery = XOR<AdaptableBooleanQuery, XOR<AdaptableScalarQuery, XOR<AdaptableObservableQuery, XOR<AdaptableAggregatedBooleanQuery, AdaptableAggregatedScalarQuery>>>>;
+export type AdaptableQuery = XOR<AdaptableBooleanQuery, XOR<AdaptableScalarQuery, XOR<AdaptableObservableQuery, XOR<AdaptableAggregatedBooleanQuery, AdaptableAggregatedScalarQuery>>>>;
 export declare const isReactiveQuery: (query: Partial<AdaptableQuery>) => boolean;

package/src/PredefinedConfig/Common/AdaptableScope.d.ts CHANGED Viewed

@@ -1,14 +1,14 @@
-export declare type ScopeDataType = 'String' | 'Number' | 'Boolean' | 'Date';
-export declare type ScopeAll = {
+export type ScopeDataType = 'String' | 'Number' | 'Boolean' | 'Date';
+export type ScopeAll = {
     All: true;
 };
-export declare type ScopeDataTypes<Type = ScopeDataType> = {
+export type ScopeDataTypes<Type = ScopeDataType> = {
     DataTypes: Type[];
 };
-export declare type ScopeColumnIds = {
+export type ScopeColumnIds = {
     ColumnIds: string[];
 };
 /**
  * Defines where a given Object / Module is active
  */
-export declare type AdaptableScope<Type = ScopeDataType> = ScopeAll | ScopeDataTypes<Type> | ScopeColumnIds;
+export type AdaptableScope<Type = ScopeDataType> = ScopeAll | ScopeDataTypes<Type> | ScopeColumnIds;

package/src/PredefinedConfig/Common/AggregationColumns.d.ts CHANGED Viewed

@@ -15,4 +15,4 @@ export interface WeightedAverageAggregation {
 /**
  * Defines which Columns in a Layout display Aggregated values when Row-Grouped
  */
-export declare type AggregationColumns = Record<string, string | true | WeightedAverageAggregation>;
+export type AggregationColumns = Record<string, string | true | WeightedAverageAggregation>;

package/src/PredefinedConfig/Common/ColumnFilter.d.ts CHANGED Viewed

@@ -35,8 +35,8 @@ export interface ColumnFilterPredicate extends AdaptablePredicate {
 /**
  * Array containing all System Filter Predicates
  */
-export declare type SystemFilterPredicateIds = SystemFilterPredicateId[];
+export type SystemFilterPredicateIds = SystemFilterPredicateId[];
 /**
  * List of System Predicates available for Filters
  */
-export declare type SystemFilterPredicateId = 'Values' | 'ExcludeValues' | 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'InRange' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'BooleanToggle';
+export type SystemFilterPredicateId = 'Values' | 'ExcludeValues' | 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'InRange' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'BooleanToggle';

package/src/PredefinedConfig/Common/Entitlement.d.ts CHANGED Viewed

@@ -15,4 +15,4 @@ export interface Entitlement {
 /**
  * Whether an Entitlement is `ReadOnly`, `Hidden` or `Full`
  */
-export declare type AccessLevel = 'ReadOnly' | 'Hidden' | 'Full';
+export type AccessLevel = 'ReadOnly' | 'Hidden' | 'Full';