@adaptabletools/adaptable-cjs 18.0.0 → 18.0.2-canary.0

package/package.json

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

package/src/Api/ColumnApi.d.ts

@@ -250,9 +250,9 @@ export interface ColumnApi {
      */
     isColumnInGrid(columnId: string): boolean;
     /**
-     * Retrieves current Primary Key Column in AdapTable
+     * Retrieves current Primary Key Column in AdapTable. It may be undefined if the primary key is auto-generated, or it is NOT mapped to a column.
      */
-    getPrimaryKeyColumn(): AdaptableColumn;
+    getPrimaryKeyColumn(): AdaptableColumn | undefined;
     /**
      * Returns the default Aggregation Function for a Column
      * @param columnId Column to Check

package/src/Api/ConfigApi.d.ts

@@ -21,11 +21,17 @@ import { AdaptableSearchState, AdaptableSortState, NamedQueryState, PredefinedCo
  */
 export interface ConfigApi {
     /**
-     * Changes the key used for persisting the AdaptableState into localStorage
-     * @param adaptableStateKey key for persisting the AdaptableState into localStorage
+     * Changes the key used for persisting the AdaptableState into localStorage. Optionally provides a predefinedConfig to load.
+     * @param adaptableStateKey - key for persisting the AdaptableState into localStorage
+     * @param config.predefinedConfig - new predefinedConfig to load
+     * @param config.flushCurrentState - whether to flush(persist) the current state before loading the new predefinedConfig
+     * @param config.progressIndicatorLabel - label for the progress indicator
+     *
      */
     setAdaptableStateKey(adaptableStateKey: string, config?: {
-        predefinedConfig: PredefinedConfig;
+        predefinedConfig?: PredefinedConfig;
+        flushCurrentState?: boolean;
+        progressIndicatorLabel?: string;
     }): Promise<void>;
     /**
      * Returns current Predefined Config

package/src/Api/Implementation/ConfigApiImpl.d.ts

@@ -37,8 +37,9 @@ export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     getAdaptableSortState(): AdaptableSortState;
     getAdaptableOptions(): Readonly<AdaptableOptions>;
     setAdaptableStateKey(adaptableStateKey: string, config?: {
-        predefinedConfig: PredefinedConfig;
+        predefinedConfig?: PredefinedConfig;
         flushCurrentState?: boolean;
+        progressIndicatorLabel?: string;
     }): Promise<void>;
     getDescriptionForModule(module: AdaptableModule): string;
     getHelpPageForModule(module: AdaptableModule): string;

package/src/Api/Implementation/ConfigApiImpl.js

@@ -114,7 +114,8 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
     }
     setAdaptableStateKey(adaptableStateKey, config) {
         return new Promise((resolve, reject) => {
-            this.getAdaptableApi().internalApi.executeWithProgressIndicator(`Initialising...`, () => {
+            var _a;
+            this.getAdaptableApi().internalApi.executeWithProgressIndicator((_a = config === null || config === void 0 ? void 0 : config.progressIndicatorLabel) !== null && _a !== void 0 ? _a : `Initialising...`, () => {
                 const flushCurrentState = !config || config.flushCurrentState !== false;
                 // make sure we persist any "pending" changes to state - since stateOptions.debounceStateDelay can cause
                 // the state to be persisted with a delay, which we dont want in this case
@@ -149,6 +150,9 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                     })
                         .catch((e) => {
                         this.logError('Error setting Adaptable State Key', e);
+                    })
+                        .finally(() => {
+                        this.getUserInterfaceApi().hideProgressIndicator();
                     });
                 });
             });

package/src/View/DataImport/systemFileHandlers.js

@@ -19,7 +19,7 @@ const parseCSV = (content) => {
             const item = {};
             for (let j = 0; j < headers.length; j++) {
                 const value = values[j];
-                item[headers[j]] = value === '' || isNaN(Number(value)) ? value : Number(value);
+                item[headers[j]] = value === '' || isNaN(Number(value)) ? value : Number(value); // '0012345'
             }
             data.push(item);
         }

package/src/View/Note/NotePopup.js

@@ -11,6 +11,7 @@ const AdaptableContext_1 = require("../AdaptableContext");
 const AdaptableButton_1 = require("../Components/AdaptableButton");
 const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
+const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const tableDOMProps = {
     style: {
         height: '100%',
@@ -21,7 +22,9 @@ const tableDOMProps = {
 const NotePopup = (props) => {
     var _a, _b, _c, _d;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const primaryKeyHeader = adaptable.api.columnApi.getFriendlyNameForColumnId(adaptable.api.columnApi.getPrimaryKeyColumn().columnId);
+    const primaryKeyHeader = adaptable.api.columnApi.getPrimaryKeyColumn()
+        ? adaptable.api.columnApi.getFriendlyNameForColumnId(adaptable.api.columnApi.getPrimaryKeyColumn().columnId)
+        : StringExtensions_1.default.Humanize(adaptable.adaptableOptions.primaryKey);
     const dateFormat = (_d = (_c = (_b = (_a = adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions) === null || _b === void 0 ? void 0 : _b.call(_a)) === null || _c === void 0 ? void 0 : _c.dateFormat) !== null && _d !== void 0 ? _d : GeneralConstants_1.DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME;
     const allNotes = (0, react_redux_1.useSelector)((state) => (0, NoteRedux_1.GetAllNotesSelector)(state.Note));
     const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Note') === 'ReadOnly';

package/src/View/StyledColumn/Wizard/StyledColumnWizard.js

@@ -81,7 +81,23 @@ const StyledColumnWizard = (props) => {
                     React.createElement(StyledColumnWizardStyleSection_1.StyledColumnWizardStyleSection, { onChange: setStyledColumn })));
             },
             title: 'Style',
-        });
+            isValid: () => {
+                var _a, _b, _c;
+                const columnComparison = (_b = (_a = styledColumn.GradientStyle) === null || _a === void 0 ? void 0 : _a.ColumnComparison) !== null && _b !== void 0 ? _b : (_c = styledColumn.PercentBarStyle) === null || _c === void 0 ? void 0 : _c.ColumnComparison;
+                return columnComparison
+                    ? columnComparison.MaxValue == undefined && columnComparison.MinValue == undefined
+                        ? 'Define Min and Max Values for the Column Comparison'
+                        : columnComparison.MaxValue == undefined
+                            ? 'Define a Max Value for the Column Comparison'
+                            : columnComparison.MinValue == undefined
+                                ? 'Define a Min Value for the Column Comparison'
+                                : true
+                    : true;
+            },
+        }
+        // Only available for Badge
+        // AdditionalSettingSection
+        );
     }
     else if (styledColumn.BadgeStyle) {
         specificSteps.push({

package/src/View/StyledColumn/Wizard/StyledColumnWizardStyleSection/StyledColumnWizardStyleSection.js

@@ -61,6 +61,10 @@ const getColumnComparison = (columnComparison, api) => {
             } })));
 };
 const renderStyledColumnStyleSummary = (data, api) => {
+    if (!api) {
+        const { api: adaptableApi } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
+        api = adaptableApi;
+    }
     if (data.GradientStyle) {
         if (data.GradientStyle.CellRanges) {
             return getRanges(data.GradientStyle.CellRanges, data.GradientStyle.RangeValueType);
@@ -97,8 +101,10 @@ const StyledColumnWizardStyleSection = (props) => {
     const scope = { ColumnIds: [data.ColumnId] }; // TODO: remove scope when format column columnStyle is removed
     // gradient
     const onUpdateGradientStyleRanges = (ranges) => {
-        const GradientStyle = Object.assign(Object.assign({}, data.GradientStyle), { CellRanges: ranges });
-        props.onChange(Object.assign(Object.assign({}, data), { GradientStyle }));
+        const gradientStyle = Object.assign(Object.assign({}, data.GradientStyle), { CellRanges: ranges });
+        // delete gradientStyle.ColumnComparison in case we are switching from ColumnComparison to CellRanges
+        delete gradientStyle.ColumnComparison;
+        props.onChange(Object.assign(Object.assign({}, data), { GradientStyle: gradientStyle }));
     };
     const onUpdateGradientStyleColumnComparison = (columnComparison) => {
         const GradientStyle = {

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.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: 1713175459078 || Date.now(),
-    VERSION: "18.0.0" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1713452251297 || Date.now(),
+    VERSION: "18.0.2-canary.0" || '--current-version--',
 };