@adaptabletools/adaptable 17.0.6 → 18.0.0-canary.0

package/src/Redux/Store/AdaptableReduxLocalStorageEngine.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createEngine = void 0;
-const tslib_1 = require("tslib");
-const isomorphic_fetch_1 = tslib_1.__importDefault(require("isomorphic-fetch"));
-const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
-const AdaptableReduxMerger_1 = require("./AdaptableReduxMerger");
-const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
-const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
+import fetch from 'isomorphic-fetch';
+import debounce from 'lodash/debounce';
+import { AddStateSource, MergeStateFunction } from './AdaptableReduxMerger';
+import { StringExtensions } from '../../Utilities/Extensions/StringExtensions';
+import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
 const checkStatus = (response) => {
     const error = new Error(response.statusText);
     if (response.status >= 200 && response.status < 300) {
@@ -40,7 +36,7 @@ class AdaptableReduxLocalStorageEngine {
         this.persistState = config.persistState;
         this.save =
             config.debounceStateDelay > 0
-                ? (0, debounce_1.default)(this.save, config.debounceStateDelay, {
+                ? debounce(this.save, config.debounceStateDelay, {
                     maxWait: 1000,
                 })
                 : this.save;
@@ -55,27 +51,27 @@ class AdaptableReduxLocalStorageEngine {
             userName: this.userName,
         }).then((parsedJsonState) => {
             if (typeof predefinedConfig === 'string' &&
-                StringExtensions_1.StringExtensions.IsNotNullOrEmpty(predefinedConfig)) {
+                StringExtensions.IsNotNullOrEmpty(predefinedConfig)) {
                 // we have config in a file so lets merge it with the other state
-                return (0, isomorphic_fetch_1.default)(predefinedConfig)
+                return fetch(predefinedConfig)
                     .then(checkStatus)
                     .then((response) => response.json())
                     .then((parsedPredefinedState) => {
-                    return (0, AdaptableReduxMerger_1.MergeStateFunction)(parsedPredefinedState, parsedJsonState);
+                    return MergeStateFunction(parsedPredefinedState, parsedJsonState);
                 })
-                    .catch((err) => AdaptableLogger_1.AdaptableLogger.consoleErrorBase(`AdaptableId: ${this.adaptableId}`, err));
+                    .catch((err) => AdaptableLogger.consoleErrorBase(`AdaptableId: ${this.adaptableId}`, err));
             }
             if (predefinedConfig != null) {
                 // we have config as an object so need to merge that
                 return Promise.resolve(predefinedConfig)
                     .then((parsedPredefinedState) => {
-                    return (0, AdaptableReduxMerger_1.MergeStateFunction)(parsedPredefinedState, parsedJsonState);
+                    return MergeStateFunction(parsedPredefinedState, parsedJsonState);
                 })
-                    .catch((err) => AdaptableLogger_1.AdaptableLogger.consoleErrorBase(`AdaptableId: ${this.adaptableId}`, err));
+                    .catch((err) => AdaptableLogger.consoleErrorBase(`AdaptableId: ${this.adaptableId}`, err));
             }
             // no predefined config so nothing to merge
             return new Promise((resolve) => {
-                resolve(!!parsedJsonState ? (0, AdaptableReduxMerger_1.AddStateSource)(parsedJsonState, 'User') : {});
+                resolve(!!parsedJsonState ? AddStateSource(parsedJsonState, 'User') : {});
             }).catch(rejectWithMessage);
         });
     }
@@ -95,7 +91,7 @@ class AdaptableReduxLocalStorageEngine {
         }
         const promise = (_a = (this.persistState || persistState)(result, config)) === null || _a === void 0 ? void 0 : _a.catch(rejectWithMessage);
         if (!(promise instanceof Promise)) {
-            AdaptableLogger_1.AdaptableLogger.consoleWarnBase(`AdaptableId: ${this.adaptableId}`, 'stateOptions.persistState should return a promise, it returned', 'Error', promise);
+            AdaptableLogger.consoleWarnBase(`AdaptableId: ${this.adaptableId}`, 'stateOptions.persistState should return a promise, it returned', 'Error', promise);
         }
         return promise;
     }
@@ -103,7 +99,6 @@ class AdaptableReduxLocalStorageEngine {
 function rejectWithMessage(error) {
     return Promise.reject(error.message);
 }
-function createEngine(config) {
+export function createEngine(config) {
     return new AdaptableReduxLocalStorageEngine(config);
 }
-exports.createEngine = createEngine;

package/src/Redux/Store/AdaptableReduxMerger.js

@@ -1,16 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeReducer = exports.MergeState = exports.MergeStateFunction = exports.ProcessKeepUserDefinedRevision = exports.AddStateSource = void 0;
-const tslib_1 = require("tslib");
-const mergeWith_1 = tslib_1.__importDefault(require("lodash/mergeWith"));
-const merge_1 = tslib_1.__importDefault(require("lodash/merge"));
-const isArray_1 = tslib_1.__importDefault(require("lodash/isArray"));
-const extend_1 = tslib_1.__importDefault(require("lodash/extend"));
-const isObject_1 = tslib_1.__importDefault(require("lodash/isObject"));
-const isAdaptableObject_1 = require("../../Utilities/isAdaptableObject");
-const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
+import mergeWith from 'lodash/mergeWith';
+import merge from 'lodash/merge';
+import isArray from 'lodash/isArray';
+import extend from 'lodash/extend';
+import isObject from 'lodash/isObject';
+import { isAdaptableObject } from '../../Utilities/isAdaptableObject';
+import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
 function customizer(objValue, srcValue) {
-    if ((0, isArray_1.default)(objValue)) {
+    if (isArray(objValue)) {
         if (!Array.isArray(srcValue)) {
             // TODO AFL: clarify if this is still relevant, after the config/options refactoring
             /**
@@ -21,7 +17,7 @@ function customizer(objValue, srcValue) {
             return srcValue;
         }
         const length = srcValue ? srcValue.length : null;
-        const result = (0, mergeWith_1.default)(objValue, srcValue, customizer);
+        const result = mergeWith(objValue, srcValue, customizer);
         if (length != null) {
             // when merging arrays, lodash result has the length of the
             // longest array, but we don't want that to happen
@@ -31,11 +27,11 @@ function customizer(objValue, srcValue) {
         return result;
     }
 }
-function AddStateSource(stateObject = {}, source) {
+export function AddStateSource(stateObject = {}, source) {
     const traverseStateObject = (object) => {
         Object.values(object).forEach((value) => {
             // add a Source only to AdaptableObjects which do NOT already have a source defined
-            if ((0, isAdaptableObject_1.isAdaptableObject)(value) && value.Source == null) {
+            if (isAdaptableObject(value) && value.Source == null) {
                 value.Source = source;
             }
             if (value !== null && typeof value === 'object') {
@@ -46,14 +42,13 @@ function AddStateSource(stateObject = {}, source) {
     traverseStateObject(stateObject);
     return stateObject;
 }
-exports.AddStateSource = AddStateSource;
-function ProcessKeepUserDefinedRevision(configState, currentUserState) {
+export function ProcessKeepUserDefinedRevision(configState, currentUserState) {
     const traverseStateObject = (configObject, stateObject) => {
         Object.entries(configObject).forEach(([key, configValue]) => {
             const stateValue = stateObject[key];
             if (Array.isArray(configValue) && Array.isArray(stateValue)) {
                 const userDefinedItems = stateValue.filter((item) => {
-                    return (0, isAdaptableObject_1.isAdaptableObject)(item) && item.Source !== 'Config';
+                    return isAdaptableObject(item) && item.Source !== 'Config';
                 });
                 configObject[key] = configValue.concat(userDefinedItems);
                 // we probably don't need to call traverseStateObject on the array as well,
@@ -71,11 +66,10 @@ function ProcessKeepUserDefinedRevision(configState, currentUserState) {
     traverseStateObject(configState, currentUserState);
     return configState;
 }
-exports.ProcessKeepUserDefinedRevision = ProcessKeepUserDefinedRevision;
 function deepClone(obj) {
     return JSON.parse(JSON.stringify(obj));
 }
-function MergeStateFunction(oldState, newState) {
+export function MergeStateFunction(oldState, newState) {
     // return MergeState(oldState, newState);
     var _a, _b, _c;
     if (newState === '') {
@@ -87,7 +81,7 @@ function MergeStateFunction(oldState, newState) {
     let state = newState;
     if (!state || typeof state !== 'object') {
         // in case loadState returns something different than an empty object
-        AdaptableLogger_1.AdaptableLogger.consoleWarnBase('State is something different than expected; expected an object, but received: ', state);
+        AdaptableLogger.consoleWarnBase('State is something different than expected; expected an object, but received: ', state);
         state = {};
     }
     // any Module in config that doesn't exist in state will be added
@@ -117,10 +111,9 @@ function MergeStateFunction(oldState, newState) {
     const finalState = AddStateSource(state, 'User');
     return finalState;
 }
-exports.MergeStateFunction = MergeStateFunction;
 // main merge function
-function MergeState(oldState, newState) {
-    const result = (0, extend_1.default)({}, oldState);
+export function MergeState(oldState, newState) {
+    const result = extend({}, oldState);
     for (const key in newState) {
         if (!newState.hasOwnProperty(key)) {
             continue;
@@ -128,13 +121,13 @@ function MergeState(oldState, newState) {
         const value = newState[key];
         // Assign if we don't need to merge at all
         if (!result.hasOwnProperty(key)) {
-            result[key] = (0, isObject_1.default)(value) && !Array.isArray(value) ? (0, merge_1.default)({}, value) : value;
+            result[key] = isObject(value) && !Array.isArray(value) ? merge({}, value) : value;
             continue;
         }
         const oldValue = result[key];
-        if ((0, isObject_1.default)(value) && !Array.isArray(value)) {
+        if (isObject(value) && !Array.isArray(value)) {
             // use both lodash functions so that we can merge from State onto Predefined Config where it exists but from the former where it doesnt.
-            result[key] = (0, mergeWith_1.default)({}, oldValue, value, customizer);
+            result[key] = mergeWith({}, oldValue, value, customizer);
         }
         else {
             result[key] = value;
@@ -142,9 +135,8 @@ function MergeState(oldState, newState) {
     }
     return result;
 }
-exports.MergeState = MergeState;
 let initialState;
-const mergeReducer = (rootReducer, LOAD_STATE_TYPE) => {
+export const mergeReducer = (rootReducer, LOAD_STATE_TYPE) => {
     let finalReducer = rootReducer;
     finalReducer = (state, action) => {
         if (action.type === LOAD_STATE_TYPE) {
@@ -158,4 +150,3 @@ const mergeReducer = (rootReducer, LOAD_STATE_TYPE) => {
     };
     return finalReducer;
 };
-exports.mergeReducer = mergeReducer;

package/src/Redux/Store/AdaptableStore.d.ts

@@ -1,9 +1,9 @@
 import * as Redux from 'redux';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { IAdaptableStore } from './Interface/IAdaptableStore';
-import { ConfigState } from '../../PredefinedConfig/ConfigState';
 import { AdaptableState } from '../../PredefinedConfig/AdaptableState';
+import { ConfigState } from '../../PredefinedConfig/ConfigState';
 import { PredefinedConfig } from '../../PredefinedConfig/PredefinedConfig';
+import { IAdaptableStore } from './Interface/IAdaptableStore';
 type EmitterCallback = (data?: any) => any;
 type EmitterAnyCallback = (eventName: string, data?: any) => any;
 export declare const INIT_STATE = "INIT_STATE";