@adaptabletools/adaptable 18.1.4-canary.1 → 18.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "18.1.4-canary.1",
+  "version": "18.1.4",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableOptions/ColumnFilterOptions.d.ts

@@ -225,6 +225,13 @@ export interface ValuesFilterOptions<TData = any> {
      * @noCodeItem
      */
     showValuesCount?: boolean | ((columFilterContext: ColumnFilterContext<TData>) => boolean);
+    /**
+     * If showing a Values Count, only count currently filtered columns
+     * @defaultValue  false
+     * @gridInfoItem
+     * @noCodeItem
+     */
+    showCurrentlyFilteredValuesCount?: boolean;
     /**
      * Whether column values in filter dropdown should apply column's current Sort Order for the column
      *

package/src/Api/ColumnApi.d.ts

@@ -300,7 +300,7 @@ export interface ColumnApi {
  * Configuration of an AG Grid Column, used for runtime updating of ColDefs
  */
 export interface ColumnConfig {
-    /** Column Id */
+    /** Column Id (mandatory) */
     colId: string;
     /** True if the column is hidden */
     hide?: boolean | null;

package/src/Api/EventApi.d.ts

@@ -1,4 +1,4 @@
-import { ActionRowSubmittedInfo, AdaptableReadyInfo, AdaptableStateChangedInfo, AdaptableStateReloadedInfo, AlertFiredInfo, CalculatedColumnChangedInfo, CellChangedInfo, CellSelectionChangedInfo, ChartChangedInfo, ColumnFilterAppliedInfo, CommentChangedInfo, CustomToolbarConfiguredInfo, DashboardChangedInfo, DataImportedInfo, DataSetSelectedInfo, Fdc3MessageInfo, FlashingCellDisplayedInfo, GridDataChangedInfo, GridFilterAppliedInfo, GridSortedInfo, LayoutChangedInfo, LiveDataChangedInfo, RowSelectionChangedInfo, ScheduleTriggeredInfo, SystemStatusMessageDisplayedInfo, TeamSharingEntityChangedInfo, ThemeChangedInfo, ThemeEditedInfo } from '../types';
+import { ActionRowSubmittedInfo, AdaptableReadyInfo, AdaptableStateChangedInfo, AdaptableStateReloadedInfo, AlertFiredInfo, CalculatedColumnChangedInfo, CellChangedInfo, CellSelectionChangedInfo, ChartChangedInfo, ColumnFilterAppliedInfo, CommentChangedInfo, CustomToolbarConfiguredInfo, DashboardChangedInfo, DataImportedInfo, DataSetSelectedInfo, Fdc3MessageInfo, FlashingCellDisplayedInfo, GridDataChangedInfo, GridFilterAppliedInfo, GridSortedInfo, LayoutChangedInfo, LiveDataChangedInfo, RowSelectionChangedInfo, ScheduleTriggeredInfo, SystemStatusMessageDisplayedInfo, TeamSharingEntityChangedInfo, ThemeChangedInfo } from '../types';
 /**
  * Responsible for publishing the many Events that AdapTable fires
  */
@@ -121,17 +121,6 @@ export interface EventApi {
      * Unsubscribe from ThemeChanged
      */
     off(eventName: 'ThemeChanged', callback: (themeChangedInfo: ThemeChangedInfo) => void): void;
-    /**
-     * Event fired whenever a theme has been edited
-     * @param eventName ThemeEdited
-     * @param callback ThemeEditedInfo which just contains the name of the current Theme
-     * @returns the unsubscribe function
-     */
-    on(eventName: 'ThemeEdited', callback: (themeEditedInfo: ThemeEditedInfo) => void): VoidFunction;
-    /**
-     * Unsubscribe from ThemeEdited
-     */
-    off(eventName: 'ThemeEdited', callback: (themeEditedInfo: ThemeEditedInfo) => void): void;
     /**
      * Event fired whenever a **System Status Message is displayed** in AdapTable
      * @param eventName SystemStatusMessageDisplayed
@@ -350,6 +339,6 @@ export interface EventApi {
     emitSync(eventName: 'DashboardChanged', data?: any): any[];
     emitSync(eventName: 'FlashingCellDisplayed', data?: any): any[];
     emitSync(eventName: 'AdaptableDestroy'): any[];
-    emit(eventName: 'ActionRowSubmitted' | 'AdaptableReady' | 'AlertFired' | 'AdaptableStateChanged' | 'AdaptableStateReloaded' | 'CellChanged' | 'ChartChanged' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'DashboardChanged' | 'DataImported' | 'DataSetSelected' | 'ColumnFilterApplied' | 'Fdc3Message' | 'GridDataChanged' | 'GridSorted' | 'LayoutChanged' | 'CalculatedColumnChanged' | 'LiveDataChanged' | 'ScheduleTriggered' | 'SearchChanged' | 'CellSelectionChanged' | 'RowSelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'ThemeEdited' | 'GridFilterApplied' | 'CommentChanged', data?: any): Promise<any>;
+    emit(eventName: 'ActionRowSubmitted' | 'AdaptableReady' | 'AlertFired' | 'AdaptableStateChanged' | 'AdaptableStateReloaded' | 'CellChanged' | 'ChartChanged' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'DashboardChanged' | 'DataImported' | 'DataSetSelected' | 'ColumnFilterApplied' | 'Fdc3Message' | 'GridDataChanged' | 'GridSorted' | 'LayoutChanged' | 'CalculatedColumnChanged' | 'LiveDataChanged' | 'ScheduleTriggered' | 'SearchChanged' | 'CellSelectionChanged' | 'RowSelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'GridFilterApplied' | 'CommentChanged', data?: any): Promise<any>;
     destroy(): void;
 }

package/src/Api/Events/ThemeChanged.d.ts

@@ -5,7 +5,11 @@ import { BaseEventInfo } from './BaseEventInfo';
  */
 export interface ThemeChangedInfo extends BaseEventInfo {
     /**
-     * Selected Theme: either name of a (System) theme or the (Custom) Theme itself
+     * Current Theme: either name of a System Theme or a Custom Theme object
      */
     theme: AdaptableTheme | string;
+    /**
+     * What caused Event to fire: "ThemeSelected" or "ThemeEdited"
+     */
+    trigger: 'ThemeSelected' | 'ThemeEdited';
 }

package/src/Api/Implementation/ThemeApiImpl.js

@@ -57,7 +57,7 @@ export class ThemeApiImpl extends ApiBase {
             return;
         }
         this.adaptable.applyAdaptableTheme(currentTheme);
-        let themeChangedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { theme: currentTheme });
+        let themeChangedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { trigger: 'ThemeSelected', theme: currentTheme });
         this.getAdaptableApi().eventApi.emit('ThemeChanged', themeChangedInfo);
     }
     getUserThemes() {
@@ -78,7 +78,8 @@ export class ThemeApiImpl extends ApiBase {
     }
     editTheme(theme) {
         this.dispatchAction(ThemeRedux.ThemeEdit(theme));
-        this.getEventApi().emit('ThemeEdited', theme);
+        let themeChangedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { trigger: 'ThemeEdited', theme: theme });
+        this.getAdaptableApi().eventApi.emit('ThemeChanged', themeChangedInfo);
         const currentTheme = this.getCurrentTheme();
         if (currentTheme === theme.Name) {
             this.adaptable.applyAdaptableTheme(theme);

package/src/Api/Internal/GridInternalApi.js

@@ -84,7 +84,7 @@ export class GridInternalApi extends ApiBase {
         const shouldShowValuesCount = this.shouldShowValuesCount(abColumn);
         let valueOptions = [];
         if (shouldShowValuesCount) {
-            const allGridCells = this.adaptable.getGridCellsForColumn(columnId);
+            const allGridCells = this.adaptable.getGridCellsForColumn(columnId, false, this.getColumnFilterOptions().valuesFilterOptions.showCurrentlyFilteredValuesCount);
             const allGridValues = allGridCells.map((gc) => gc.displayValue);
             const newsortedDistinctValues = sortedDistinctValues.filter((gc) => gc.displayValue != undefined && gc.displayValue != '' && gc.displayValue != null);
             valueOptions = newsortedDistinctValues.map((cv) => {

package/src/PredefinedConfig/Common/RowSummary.d.ts

@@ -22,8 +22,8 @@ export interface RowSummary extends SuspendableObject {
      */
     ColumnsMap: Record<string, SummarySupportedExpression>;
     /**
-     * Whether to include only filtered rows in the summary.
-     * @defauts true
+     * Evaluates only currently filtered rows in the summary
+     * @defaultValue true
      */
     IncludeOnlyFilteredRows?: boolean;
 }

package/src/Utilities/Services/ThemeService.js

@@ -23,11 +23,9 @@ export class ThemeService {
     }
     subscribe() {
         const themeChangedUnsubscribe = this.api.eventApi.on('ThemeChanged', this.onThemeChanged);
-        const themeEditedUnsubscribe = this.api.eventApi.on('ThemeEdited', this.onThemeChanged);
         const prefferedColorSchemeUnsubscribe = this.attachPrefferedColorSchemeListener();
         this.unsubscribe = () => {
             themeChangedUnsubscribe();
-            themeEditedUnsubscribe();
             prefferedColorSchemeUnsubscribe();
         };
     }

package/src/View/Theme/ThemeEditor.js

@@ -96,10 +96,8 @@ export const ThemeEditor = (props) => {
             setCurrentThemeObject(Object.assign({}, theme));
         };
         const themeChangedUnsubscribe = adaptable.api.eventApi.on('ThemeChanged', updateTheme);
-        const themeEditedUnsubscribe = adaptable.api.eventApi.on('ThemeEdited', updateTheme);
         return () => {
             themeChangedUnsubscribe();
-            themeEditedUnsubscribe();
         };
     }, []);
     const handleNameDescriptionChangeThrottled = React.useMemo(() => {

package/src/agGrid/defaultAdaptableOptions.js

@@ -190,6 +190,7 @@ const DefaultAdaptableOptions = {
             sortValuesFilter: false,
             filterValuesUsingTime: false,
             showCurrentlyFilteredValuesOnly: false,
+            showCurrentlyFilteredValuesCount: false,
             maxFilterValuesToDisplay: undefined,
             showValuesCount: undefined,
             valuesFilterPredicateOptions: undefined,

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     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: 1718817419535 || Date.now(),
-    VERSION: "18.1.4-canary.1" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1719311651204 || Date.now(),
+    VERSION: "18.1.4" || '--current-version--',
 };

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

@@ -4744,12 +4744,14 @@ export declare const ADAPTABLE_METAMODEL: {
             kind: string;
             desc: string;
             isOpt?: undefined;
+            defVal?: undefined;
             ref?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
+            defVal: string;
             ref?: undefined;
         } | {
             name: string;
@@ -4757,6 +4759,7 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
             isOpt: boolean;
             ref: string;
+            defVal?: undefined;
         })[];
     };
     RowSummaryPosition: {