@xh/hoist 55.3.0 → 55.3.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v55.3.2 - 2023-03-22
+
+### 🐞 Bug Fixes
+* Fix grid bug whereby LocalDate filter entered via FilterChooser was causing column filtering
+  to fail.
+
+
+## v55.3.1 - 2023-03-14
+
+### 🐞 Bug Fixes
+* Revert `structuredClone` to lodash `deepClone` throughout toolkit.
+
 ## v55.3.0 - 2023-03-03
 
 ### 🐞 Bug Fixes

package/admin/differ/DifferModel.ts

@@ -13,7 +13,7 @@ import {Icon} from '@xh/hoist/icon';
 import {bindable, makeObservable, observable, action} from '@xh/hoist/mobx';
 import {pluralize} from '@xh/hoist/utils/js';
 import {hbox} from '@xh/hoist/cmp/layout';
-import {isEqual, isString, isNil, omit, remove, trimEnd} from 'lodash';
+import {cloneDeep, isEqual, isString, isNil, omit, remove, trimEnd} from 'lodash';
 import {hspacer} from '../../cmp/layout';
 
 import {DifferDetailModel} from './DifferDetailModel';
@@ -151,7 +151,7 @@ export class DifferModel extends HoistModel {
             const resp = await Promise.all([
                 XH.fetchJson({url: `${url}/${entityName}s`, loadSpec}),
                 this.clipboardContent ?
-                    Promise.resolve(structuredClone(this.clipboardContent)) :
+                    Promise.resolve(cloneDeep(this.clipboardContent)) :
                     XH.fetchJson({url: `${remoteBaseUrl}${url}/${entityName}s`, loadSpec})
             ]);
             this.processResponse(resp);
@@ -250,8 +250,8 @@ export class DifferModel extends HoistModel {
 
     rawRecordsAreEqual(local, remote) {
         // cloning to avoid disturbing the source data.
-        local = structuredClone(local);
-        remote = structuredClone(remote);
+        local = cloneDeep(local);
+        remote = cloneDeep(remote);
 
         // For JSON records, parse JSON to do an accurate value compare,
         if (local?.valueType === 'json' && remote?.valueType === 'json') {

package/cmp/ag-grid/AgGridModel.ts

@@ -9,6 +9,7 @@ import {action, bindable, computed, makeObservable, observable} from '@xh/hoist/
 import {throwIf} from '@xh/hoist/utils/js';
 import {
     castArray,
+    cloneDeep,
     concat,
     find,
     has,
@@ -305,7 +306,7 @@ export class AgGridModel extends HoistModel {
     setSortState(sortState: AgGridColumnSortState[]) {
         this.throwIfNotReady();
 
-        const sortedColumnState = structuredClone(sortState),
+        const sortedColumnState = cloneDeep(sortState),
             [primaryColumnState, secondaryColumnState] = partition(sortedColumnState, it => !isArray(it.colId)),
             {agColumnApi: colApi, agApi} = this,
             isPivot = colApi.isPivotMode(),

package/cmp/chart/Chart.ts

@@ -355,7 +355,7 @@ class ChartLocalModel extends HoistModel {
     }
 
     getThemeConfig() {
-        return XH.darkTheme ? structuredClone(DarkTheme) : structuredClone(LightTheme);
+        return XH.darkTheme ? cloneDeep(DarkTheme) : cloneDeep(LightTheme);
     }
 
     getModelConfig() {

package/cmp/chart/ChartModel.ts

@@ -6,7 +6,7 @@
  */
 import {HoistModel, PlainObject, Some} from '@xh/hoist/core';
 import {action, makeObservable, observable} from '@xh/hoist/mobx';
-import {castArray, merge} from 'lodash';
+import {castArray, cloneDeep, merge} from 'lodash';
 
 interface ChartConfig {
 
@@ -84,7 +84,7 @@ export class ChartModel extends HoistModel {
      */
     @action
     updateHighchartsConfig(update: any) {
-        this.highchartsConfig = merge(structuredClone(this.highchartsConfig), update);
+        this.highchartsConfig = merge(cloneDeep(this.highchartsConfig), update);
     }
 
     /** @param series - one or more data series to be charted. */

package/cmp/filter/FilterChooserModel.ts

@@ -29,6 +29,7 @@ import {throwIf, withDefault} from '@xh/hoist/utils/js';
 import {createObservableRef} from '@xh/hoist/utils/react';
 import {ReactNode} from 'react';
 import {
+    cloneDeep,
     compact,
     flatMap,
     flatten,
@@ -373,7 +374,7 @@ export class FilterChooserModel extends HoistModel {
             // it's internal `value`. Force synchronise its `value` to our bound `selectValue`
             // to get it back inline. Note we're intentionally not using `setSelectValue()`,
             // which returns early if the actual filter value hasn't changed.
-            this.selectValue = structuredClone(this.selectValue);
+            this.selectValue = cloneDeep(this.selectValue);
         });
     }
 

package/cmp/grid/GridModel.ts

@@ -60,6 +60,7 @@ import equal from 'fast-deep-equal';
 import {
     castArray,
     clone,
+    cloneDeep,
     compact,
     defaults,
     defaultsDeep,
@@ -1060,7 +1061,7 @@ export class GridModel extends HoistModel {
     applyColumnStateChanges(colStateChanges: Partial<ColumnState>[]) {
         if (isEmpty(colStateChanges)) return;
 
-        let columnState = structuredClone(this.columnState);
+        let columnState = cloneDeep(this.columnState);
 
         throwIf(colStateChanges.some(({colId}) => !find(columnState, {colId})),
             'Invalid columns detected in column changes!');

package/cmp/grid/filter/GridFilterFieldSpec.ts

@@ -66,7 +66,7 @@ export class GridFilterFieldSpec extends BaseFilterFieldSpec {
     // Implementation
     //------------------------
     loadValuesFromSource() {
-        const {filterModel, field, source} = this,
+        const {filterModel, field, source, sourceField} = this,
             columnFilters = filterModel.getColumnFilters(field),
             sourceStore = source instanceof View ? source.cube.store : source,
             allRecords = sourceStore.allRecords;
@@ -83,7 +83,10 @@ export class GridFilterFieldSpec extends BaseFilterFieldSpec {
         // Get values from current column filter
         const filterValues = [];
         columnFilters.forEach(filter => {
-            const newValues = castArray(filter.value).map(value => filterModel.toDisplayValue(value));
+            const newValues = castArray(filter.value).map(value => {
+                value = sourceField.parseVal(value);
+                return filterModel.toDisplayValue(value);
+            });
             filterValues.push(...newValues);
         });
 

package/cmp/grouping/GroupingChooserModel.ts

@@ -10,7 +10,7 @@ import {action, computed, observable, makeObservable} from '@xh/hoist/mobx';
 import {genDisplayName} from '@xh/hoist/data';
 import {throwIf} from '@xh/hoist/utils/js';
 import {createObservableRef} from '@xh/hoist/utils/react';
-import {difference, isFunction, isArray, isEmpty, isEqual, isString, keys, sortBy} from 'lodash';
+import {cloneDeep, difference, isFunction, isArray, isEmpty, isEqual, isString, keys, sortBy} from 'lodash';
 
 export interface GroupingChooserConfig {
     /**
@@ -128,7 +128,7 @@ export class GroupingChooserModel extends HoistModel {
                 this.persistValue = persistWith.persistValue ?? true;
                 this.persistFavorites = persistWith.persistFavorites ?? true;
 
-                const state = structuredClone(this.provider.read());
+                const state = cloneDeep(this.provider.read());
                 if (this.persistValue && state?.value && this.validateValue(state?.value)) {
                     value = state.value;
                 }

package/core/HoistBase.ts

@@ -7,6 +7,7 @@
 import {XH, PersistenceProvider, PersistOptions, DebounceSpec} from './';
 import {throwIf, getOrCreate} from '@xh/hoist/utils/js';
 import {
+    cloneDeep,
     debounce as lodashDebounce,
     isFunction,
     isNil,
@@ -219,7 +220,7 @@ export abstract class HoistBase {
                 provider = this.markManaged(PersistenceProvider.create(persistWith)),
                 providerState = provider.read();
             if (!isUndefined(providerState)) {
-                runInAction(() => this[property] = structuredClone(providerState));
+                runInAction(() => this[property] = cloneDeep(providerState));
             }
             this.addReaction({
                 track: () => this[property],

package/core/HoistBaseDecorators.ts

@@ -9,6 +9,7 @@ import {PersistenceProvider, PersistOptions, HoistBaseClass} from './';
 import {isUndefined} from 'lodash';
 import {wait} from '../promise';
 import {throwIf} from '../utils/js';
+import {cloneDeep} from 'lodash';
 
 /**
  * Decorator to make a property "managed". Managed properties are designed to hold objects that
@@ -75,7 +76,7 @@ function createPersistDescriptor(target: HoistBaseClass, property: string, descr
         try {
             const persistWith = {path: property, ...this.persistWith, ...options},
                 provider = this.markManaged(PersistenceProvider.create(persistWith));
-            providerState = structuredClone(provider.read());
+            providerState = cloneDeep(provider.read());
             wait().then(() => {
                 this.addReaction({
                     track: () => this[property],

package/core/persist/PersistenceProvider.ts

@@ -8,6 +8,7 @@
 import {DebounceSpec, XH} from '../';
 import {LocalStorageProvider, PrefProvider, DashViewProvider, CustomProvider, PersistOptions} from './';
 import {
+    cloneDeep,
     isUndefined,
     get,
     set,
@@ -95,7 +96,7 @@ export class PersistenceProvider {
      * Clear any state saved by this object at a path
      */
     clear(path: string = this.path) {
-        const obj = structuredClone(this.readRaw());
+        const obj = cloneDeep(this.readRaw());
         unset(obj, this.path);
         this.writeRaw(obj);
     }
@@ -111,7 +112,7 @@ export class PersistenceProvider {
     // Implementation
     //----------------
     protected writeInternal(data: object) {
-        const obj = structuredClone(this.readRaw());
+        const obj = cloneDeep(this.readRaw());
         set(obj, this.path, data);
         this.writeRaw(obj);
     }

package/desktop/cmp/dash/container/DashContainerModel.ts

@@ -22,6 +22,7 @@ import {debounced, ensureUniqueBy, throwIf} from '@xh/hoist/utils/js';
 import {createObservableRef} from '@xh/hoist/utils/react';
 import {isOmitted} from '@xh/hoist/utils/impl';
 import {
+    cloneDeep,
     defaultsDeep,
     find,
     isFinite,
@@ -539,7 +540,7 @@ export class DashContainerModel extends DashModel<DashContainerViewSpec, DashVie
     private createGoldenLayout(containerEl: HTMLElement, state: any): GoldenLayout {
         const {viewSpecs} = this,
             ret = new GoldenLayout({
-                content: convertStateToGL(structuredClone(state), this),
+                content: convertStateToGL(cloneDeep(state), this),
                 settings: {
                     // Remove icons by default
                     showPopoutIcon: false,

package/desktop/cmp/grid/impl/filter/values/ValuesTabModel.ts

@@ -142,7 +142,7 @@ export class ValuesTabModel extends HoistModel {
 
     @action
     private doSyncWithFilter() {
-        const {values, columnFilters, gridFilterModel} = this,
+        const {values, columnFilters, gridFilterModel, fieldSpec} = this,
             {fieldType} = this.headerFilterModel;
 
         if (isEmpty(columnFilters)) {
@@ -157,7 +157,10 @@ export class ValuesTabModel extends HoistModel {
             filterValues = [];
 
         arr.forEach(filter => {
-            const newValues = castArray(filter.value).map(value => gridFilterModel.toDisplayValue(value));
+            const newValues = castArray(filter.value).map(value => {
+                value = fieldSpec.sourceField.parseVal(value);
+                return gridFilterModel.toDisplayValue(value);
+            });
             filterValues.push(...newValues); // Todo: Is this safe?
         });
 

package/desktop/cmp/leftrightchooser/LeftRightChooser.ts

@@ -12,6 +12,7 @@ import {chooserToolbar} from './impl/ChooserToolbar';
 import {description} from './impl/Description';
 import './LeftRightChooser.scss';
 import {LeftRightChooserModel} from './LeftRightChooserModel';
+import {cloneDeep} from 'lodash';
 
 export interface LeftRightChooserProps extends HoistProps<LeftRightChooserModel>, BoxProps {}
 
@@ -36,8 +37,8 @@ export const [LeftRightChooser, leftRightChooser] = hoistCmp.withFactory<LeftRig
                     }
                 }
             },
-            leftGridOptions = structuredClone(gridOptions),
-            rightGridOptions = structuredClone(gridOptions);
+            leftGridOptions = cloneDeep(gridOptions),
+            rightGridOptions = cloneDeep(gridOptions);
 
         if (!leftGroupingExpanded) leftGridOptions.agOptions.groupDefaultExpanded = 0;
         if (!rightGroupingExpanded) rightGridOptions.agOptions.groupDefaultExpanded = 0;

package/desktop/cmp/treemap/TreeMapModel.ts

@@ -13,7 +13,7 @@ import {numberRenderer} from '@xh/hoist/format';
 import {action, bindable, computed, makeObservable, observable} from '@xh/hoist/mobx';
 import {throwIf, withDefault} from '@xh/hoist/utils/js';
 import {ReactNode} from 'react';
-import {get, isEmpty, isFinite, max, set, sortBy, sumBy, unset} from 'lodash';
+import {cloneDeep, get, isEmpty, isFinite, max, set, sortBy, sumBy, unset} from 'lodash';
 
 /**
  * Core Model for a TreeMap.
@@ -442,7 +442,7 @@ export class TreeMapModel extends HoistModel {
 
     toggleNodeExpanded(treePath) {
         const {gridModel} = this,
-            expandState = structuredClone(gridModel.expandState);
+            expandState = cloneDeep(gridModel.expandState);
 
         if (get(expandState, treePath)) {
             unset(expandState, treePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xh/hoist",
-  "version": "55.3.0",
+  "version": "55.3.2",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",

package/svc/PrefService.ts

@@ -7,7 +7,7 @@
 import {HoistService, XH} from '@xh/hoist/core';
 import {SECONDS} from '@xh/hoist/utils/datetime';
 import {deepFreeze, throwIf} from '@xh/hoist/utils/js';
-import {debounce, forEach, isEmpty, isEqual, isNil, pickBy} from 'lodash';
+import {cloneDeep, debounce, forEach, isEmpty, isEqual, isNil, pickBy} from 'lodash';
 
 /**
  * Service to read and set user-specific preference values.
@@ -92,7 +92,7 @@ export class PrefService extends HoistService {
         if (isEqual(oldValue, value)) return;
 
         // Change local value to sanitized copy and fire.
-        value = deepFreeze(structuredClone(value));
+        value = deepFreeze(cloneDeep(value));
         this._data[key].value = value;
 
         // Schedule serialization to storage
@@ -198,7 +198,7 @@ export class PrefService extends HoistService {
         for (let key in data) {
             if (data[key].local) {
                 data[key].value = !isNil(localPrefs[key]) ?
-                    deepFreeze(structuredClone(localPrefs[key])) :
+                    deepFreeze(cloneDeep(localPrefs[key])) :
                     data[key].defaultValue;
             }
         }