@adaptabletools/adaptable-cjs 22.0.0-canary.6 → 22.0.0-canary.8

package/src/migration/AdaptableUpgradeHelper.js

@@ -37,9 +37,9 @@ class AdaptableUpgradeHelper {
         let updatedState = structuredClone(state);
         for (const version of versionUpgrades) {
             if (version > fromVersion && version <= toVersion) {
-                upgradeHelper.logger.info(`Migration to ${version} started...`);
+                upgradeHelper.logger.info(`Migration to version ${version} started.`);
                 updatedState = upgradeHelper.versionUpgrades.get(version).migrateState(updatedState);
-                upgradeHelper.logger.info(`Migration to ${version} finished!`);
+                upgradeHelper.logger.info(`Migration to version ${version} completed.`);
             }
         }
         return updatedState;

package/src/migration/VersionUpgrade17.js

@@ -102,7 +102,7 @@ class VersionUpgrade17 extends VersionUpgrade_1.VersionUpgrade {
         // let dashboardState: any = this.api.dashboardApi.getDashboardState();
         let dashboardState = state.Dashboard;
         if (dashboardState?.VisibleButtons) {
-            this.logger.warn(`Updating Obsolete VisibleButtons Config for DashboardState: [${dashboardState.VisibleButtons}]`);
+            this.logger.warn(`Migrating deprecated DashboardState.VisibleButtons: [${dashboardState.VisibleButtons}].`);
             state.Dashboard.ModuleButtons = [
                 ...state.Dashboard.ModuleButtons,
                 ...dashboardState.VisibleButtons,
@@ -249,7 +249,7 @@ class VersionUpgrade17 extends VersionUpgrade_1.VersionUpgrade {
         if (!formatColumnsWithColumnStyles.length) {
             return state;
         }
-        this.logger.info(`Converting ${formatColumnsWithColumnStyles.length} FormatColumns Styles to Styled Columns`, formatColumnsWithColumnStyles);
+        this.logger.info(`Migrating ${formatColumnsWithColumnStyles.length} FormatColumn styles to StyledColumns.`, formatColumnsWithColumnStyles);
         // delete the format columns with column styles
         state.FormatColumn.FormatColumns = state.FormatColumn.FormatColumns?.filter((fc) => !fc.ColumnStyle);
         const styledColumns = formatColumnsWithColumnStyles
@@ -277,7 +277,7 @@ class VersionUpgrade17 extends VersionUpgrade_1.VersionUpgrade {
         const deprecatedToolPanelConfigs = state.ToolPanel
             ?.VisibleToolPanels;
         if (deprecatedToolPanelConfigs?.length) {
-            this.logger.warn(`Updating Obsolete VisibleToolPanels Config for ToolPanelState: [${deprecatedToolPanelConfigs}]`);
+            this.logger.warn(`Migrating deprecated ToolPanelState.VisibleToolPanels: [${deprecatedToolPanelConfigs}].`);
             const migratedToolPanelConfigs = deprecatedToolPanelConfigs.map((toolPanel) => ({
                 Name: toolPanel,
                 State: 'collapsed',
@@ -340,7 +340,7 @@ class VersionUpgrade17 extends VersionUpgrade_1.VersionUpgrade {
                 cc.CalculatedColumnSettings = {
                     DataType: 'number',
                 };
-                this.logger.warn(`Updating incorrect Initial State for Calculated Column: ${cc.ColumnId}`);
+                this.logger.warn(`Migrating Calculated Column "${cc.ColumnId}": adding default CalculatedColumnSettings.`);
             }
         });
         return state;

package/src/migration/VersionUpgrade20.js

@@ -153,7 +153,7 @@ class VersionUpgrade20 extends VersionUpgrade_1.VersionUpgrade {
         return state;
     }
     migrateColTypeToDataType(state) {
-        this.logger.info(`Converting previous column types to new data types`);
+        this.logger.info('Migrating column types to data types.');
         // Calculated Column DataType
         const calculatedColumnState = state.CalculatedColumn;
         if (calculatedColumnState && calculatedColumnState.CalculatedColumns) {
@@ -164,7 +164,7 @@ class VersionUpgrade20 extends VersionUpgrade_1.VersionUpgrade {
                     }
                     const newDataType = mapOldTypeToDataType(cc.CalculatedColumnSettings.DataType);
                     if (newDataType === 'unknown') {
-                        this.logger.warn(`Calculated Column ${cc.ColumnId} has an unknown DataType: ${cc.CalculatedColumnSettings.DataType}`);
+                        this.logger.warn(`Calculated Column "${cc.ColumnId}" has unrecognized DataType: "${cc.CalculatedColumnSettings.DataType}".`);
                     }
                     else {
                         cc.CalculatedColumnSettings.DataType = newDataType;
@@ -182,7 +182,7 @@ class VersionUpgrade20 extends VersionUpgrade_1.VersionUpgrade {
                     }
                     const newDataType = mapOldTypeToDataType(fc.FreeTextColumnSettings.DataType);
                     if (newDataType === 'unknown') {
-                        this.logger.warn(`FreeText Column ${fc.ColumnId} has an unknown DataType: ${fc.FreeTextColumnSettings.DataType}`);
+                        this.logger.warn(`FreeText Column "${fc.ColumnId}" has unrecognized DataType: "${fc.FreeTextColumnSettings.DataType}".`);
                     }
                     else {
                         fc.FreeTextColumnSettings.DataType = newDataType;
@@ -192,7 +192,7 @@ class VersionUpgrade20 extends VersionUpgrade_1.VersionUpgrade {
         }
     }
     migrateSparklineState(state) {
-        this.logger.info(`Migration of Sparkline State`);
+        this.logger.info('Migrating Sparkline state.');
         const sparklineState = state.StyledColumn;
         if (sparklineState && sparklineState.StyledColumns) {
             sparklineState.StyledColumns.forEach((styledColumn) => {

package/src/types.d.ts

@@ -10,7 +10,7 @@ export type { AggregatedBooleanFunctionName } from './Utilities/ExpressionFuncti
 export type { AggregatedScalarFunctionName } from './Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions';
 export type { AdaptableOptions } from './AdaptableOptions/AdaptableOptions';
 export { AdaptablePlugin } from './AdaptableOptions/AdaptablePlugin';
-export type { ContainerOptions } from './AdaptableOptions/ContainerOptions';
+export type { ContainerOptions, AdaptableContainerValue, AdaptableCSSSelector, InitContainerContext, ContainerContext, } from './AdaptableOptions/ContainerOptions';
 export type { FlashingCellOptions, FlashTarget } from './AdaptableOptions/FlashingCellOptions';
 export type { ToastPositions, ToastTransitions, NotificationsOptions, } from './AdaptableOptions/NotificationsOptions';
 export type { AlertOptions, CommandHandler, AlertForm, AlertFormContext, AlertMessageContext, DataChangeDetectionPolicy, } from './AdaptableOptions/AlertOptions';
@@ -172,11 +172,13 @@ export type { CellDataChangedInfo } from './AdaptableState/Common/CellDataChange
 export type { RowDataChangedInfo, RowDataChangeTrigger, } from './AdaptableState/Common/RowDataChangedInfo';
 export type { DataChangedScope } from './AdaptableState/Common/DataChangedScope';
 export type { DataUpdateConfig } from './AdaptableState/Common/DataUpdateConfig';
+export type { DataRowConfig } from './AdaptableState/Common/DataUpdateConfig';
 export type { AdaptableFormData, AdaptableForm, AdaptableFormField, AdaptableFormFieldType, } from './AdaptableState/Common/AdaptableForm';
 export type { AdaptableButton } from './AdaptableState/Common/AdaptableButton';
 export type { AdaptableMenuItem, UserMenuItem, ColumnMenuContext, ContextMenuContext, AdaptableContextMenuItem, AdaptableColumnMenuItem, AdaptableColumnMenuItemName, AdaptableContextMenuItemName, AgGridMenuItem, MenuCategory, MenuSeparator, } from './AdaptableState/Common/Menu';
 export type { BaseContext } from './AdaptableState/Common/BaseContext';
-export type { AdaptableColumnContext } from './AdaptableState/Common/AdaptableColumnContext';
+export type { AdaptableColumnContext, AdaptableColumnsContext } from './AdaptableState/Common/AdaptableColumnContext';
+export type { AdaptableRowContext } from './AdaptableState/Common/AdaptableRowContext';
 export type { FormContext } from './AdaptableState/Common/FormContext';
 export type { Schedule } from './AdaptableState/Common/Schedule';
 export type { ButtonStyle } from './AdaptableState/Common/ButtonStyle';
@@ -209,6 +211,7 @@ export type { Shortcut, ShortcutState, ShortcutScopeDataType, } from './Adaptabl
 export type { SharedEntity, AdaptableSharedEntity, CustomSharedEntity, TeamSharingState, SharedEntityType, AdaptableSharedEntityConfig, CustomSharedEntityConfig, } from './AdaptableState/TeamSharingState';
 export type { AdaptableTheme, ThemeState } from './AdaptableState/ThemeState';
 export type { ToolPanelState, AdaptableToolPanelDefinition, ToolPanelVisibilityMode, } from './AdaptableState/ToolPanelState';
+export type { UserInterfaceState } from './AdaptableState/UserInterfaceState';
 export type { AdaptableFrameworkComponent, AngularFrameworkComponent, ReactFrameworkComponent, VueFrameworkComponent, CustomRenderFunction, CustomRenderContext, } from './agGrid/AdaptableFrameworkComponent';
 export type { Fdc3Options, GridDataContextMapping, ActionColumnDefaultConfiguration, ResolveContextDataContext, RaiseIntentConfig, BroadcastConfig, HandleFdc3IntentContext, HandleFdc3Context, Fdc3ButtonContext, Fdc3AdaptableButton, HandleFdc3IntentResolutionContext, UIControlConfig, Fdc3IntentOptions, Fdc3ContextOptions, RaiseIntentConfiguration, BroadcastConfiguration, FDC3ActionColumn, } from './AdaptableOptions/Fdc3Options';
 export type { CommentState, CommentThread, AdaptableComment } from './AdaptableState/CommentState';

package/themes/dark.css

@@ -1,35 +1,36 @@
-.ab--theme-dark {
-  --ab-theme-loaded: dark;
+@layer adaptable.theme {
+  .ab--theme-dark {
+    --ab-theme-loaded: dark;
 
-  --ab-cmp-input--disabled__background: #232323; /* #b6b7b8 */
+    --ab-cmp-input--disabled__background: #232323; /* #b6b7b8 */
 
-  --ab-color-defaultbackground: #3e444c;
-  --ab-color-text-on-defaultbackground: #e2e2e2;
+    --ab-color-defaultbackground: #3e444c;
+    --ab-color-text-on-defaultbackground: #e2e2e2;
 
-  --ab-color-primary: #262d2f;
-  --ab-color-primarylight: #3d3e3f;
-  --ab-color-primarydark: #1c2021;
-  --ab-color-text-on-primary: #e2e2e2; /* F2F2F2 */
+    --ab-color-primary: #262d2f;
+    --ab-color-primarylight: #3d3e3f;
+    --ab-color-primarydark: #1c2021;
+    --ab-color-text-on-primary: #e2e2e2; /* F2F2F2 */
 
-  --ab-color-shadow: rgb(255 255 255 / 0.45);
-  --ab-cmp-modal-backdrop__background: rgba(255, 255, 255, 0.2);
+    --ab-color-shadow: rgb(255 255 255 / 0.45);
+    --ab-cmp-modal-backdrop__background: rgba(255, 255, 255, 0.2);
 
-  --ab-dashboard__border: #555;
-  --ab-cmp-dropdownbutton-list-separator__border: 1px solid #555;
+    --ab-dashboard__border: #555;
+    --ab-cmp-dropdownbutton-list-separator__border: 1px solid #555;
 
-  --ab-gridheader--filtered__background: var(--ab-color-defaultbackground);
+    --ab-gridheader--filtered__background: var(--ab-color-defaultbackground);
 
-  --ab-cmp-checkbox__border-color: var(--ab-color-text-on-primary);
-  --ab-cmp-checkbox--checked__border-color: var(--ab-color-accent);
+    --ab-cmp-checkbox__border-color: var(--ab-color-text-on-primary);
+    --ab-cmp-checkbox--checked__border-color: var(--ab-color-accent);
 
-  input[type='number'].ab-Input::-webkit-outer-spin-button,
-  input[type='number'].ab-Input::-webkit-inner-spin-button {
-    background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" viewBox="4 0 18 18" version="1.1"><path fill="%23f7f7f7" d="M7 10l5 5 5-5z" transform="translate(0, 2)"/><path fill="%23f7f7f7" d="M7 14l5-5 5 5z" transform="translate(0, -6)"/></svg>')
-      no-repeat center center;
+    input[type='number'].ab-Input::-webkit-outer-spin-button,
+    input[type='number'].ab-Input::-webkit-inner-spin-button {
+      background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" viewBox="4 0 18 18" version="1.1"><path fill="%23f7f7f7" d="M7 10l5 5 5-5z" transform="translate(0, 2)"/><path fill="%23f7f7f7" d="M7 14l5-5 5 5z" transform="translate(0, -6)"/></svg>')
+        no-repeat center center;
+    }
   }
-}
 
-/*
+  /*
 The following are only redefined here so that the DARK theme in Storybook
 can be previewed correctly as that relies on an element (not the document element)
 to have the class ab--theme-dark.
@@ -38,11 +39,11 @@ For our production release those are not needed and could be removed
 as our dark theme is anyways applied on the document element.
 
 */
-.ab--theme-dark {
-  --ab-color-inputcolor: var(--ab-color-text-on-primary);
-  --ab-cmp-input__color: var(--ab-color-inputcolor);
-  --ab-cmp-input__background: var(--ab-color-defaultbackground);
-  --ab-cmp-input--disabled__background: var(--ab-color-primarylight);
-  --ab-cmp-field-wrap__background: var(--ab-color-defaultbackground);
-  --ab-cmp-simple-button--outlined__background: var(--ab-color-defaultbackground);
+  .ab--theme-dark {
+    --ab-color-inputcolor: var(--ab-color-text-on-primary);
+    --ab-cmp-input__color: var(--ab-color-inputcolor);
+    --ab-cmp-input__background: var(--ab-color-defaultbackground);
+    --ab-cmp-input--disabled__background: var(--ab-color-primarylight);
+    --ab-cmp-field-wrap__background: var(--ab-color-defaultbackground);
+  }
 }

package/themes/light.css

@@ -1,3 +1,5 @@
-html.ab--theme-light {
-  --ab-theme-loaded: light;
+@layer adaptable.theme {
+  html.ab--theme-light {
+    --ab-theme-loaded: light;
+  }
 }