Skip to content

fix: DH-20243: improved notebook settings merging #2593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jnumainville merged 9 commits into from
Dec 19, 2025
Merged

fix: DH-20243: improved notebook settings merging #2593

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8832253
improving notebook merging
jnumainville Dec 17, 2025
ed643b6
remove sneaky mystery packages
jnumainville Dec 17, 2025
c38c974
mergeWith
jnumainville Dec 18, 2025
026e77a
refine mergewith usage
jnumainville Dec 18, 2025
c763a44
types for mergewith
jnumainville Dec 18, 2025
7229918
unknown?
jnumainville Dec 18, 2025
1004b00
I wasn't using that ignore anyways
jnumainville Dec 18, 2025
0236144
comment
jnumainville Dec 19, 2025
d8e8376
removing special config logic
jnumainville Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions packages/redux/src/selectors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { UndoPartial } from '@deephaven/utils';
import { memoize } from 'proxy-memoize';
import type { RootState, WorkspaceSettings } from './store';
import type { RootState } from './store';
import _ from 'lodash';

Check failure on line 4 in packages/redux/src/selectors.ts

View workflow job for this annotation

GitHub Actions / unit 

`lodash` import should occur before type import of `./store`

Check failure on line 4 in packages/redux/src/selectors.ts

View workflow job for this annotation

GitHub Actions / unit 

'@types/lodash' should be listed in the project's dependencies. Run 'npm i -S @types/lodash' to add it

const EMPTY_OBJECT = Object.freeze({});

Expand Down Expand Up @@ -62,16 +63,17 @@
): UndoPartial<State['workspace']['data']['settings']> => {
const customizedSettings = getWorkspace(store)?.data.settings ?? {};

const settings = { ...getDefaultWorkspaceSettings(store) };
const keys = Object.keys(customizedSettings) as (keyof WorkspaceSettings)[];
for (let i = 0; i < keys.length; i += 1) {
const key = keys[i];
if (customizedSettings[key] !== undefined) {
// @ts-expect-error assign non-undefined customized settings to settings
settings[key] = customizedSettings[key];
return _.mergeWith(
{},
getDefaultWorkspaceSettings(store),
customizedSettings,
(objValue, srcValue) => {
if (Array.isArray(objValue) && Array.isArray(srcValue)) {
return srcValue;
}
return undefined;
}
}
return settings as UndoPartial<State['workspace']['data']['settings']>;
) as UndoPartial<State['workspace']['data']['settings']>;
}
);

Expand Down
Loading