Skip to content

groupBy variable update logic cleaup #1380

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
kristinademeshchik merged 3 commits into from
Mar 4, 2026
+0 −70
Merged

groupBy variable update logic cleaup #1380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b995161
groupby state update
kristinademeshchik Mar 4, 2026
7e87f8f
update tests
kristinademeshchik Mar 4, 2026
df7956d
leftover test
kristinademeshchik Mar 4, 2026
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
58 changes: 0 additions & 58 deletions packages/scenes/src/variables/groupby/GroupByVariable.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,64 +301,6 @@ describe.each(['11.1.2', '11.1.1'])('GroupByVariable', (v) => {
expect(variable.state.value).toEqual(['defaultVal1', 'defaultVal2']);
});

it('should apply defaultValue to value when defaultValue is set', async () => {
const { variable } = setupTest({});

expect(variable.state.value).toEqual('');

act(() => {
variable.setState({
defaultValue: {
value: ['newDefault'],
text: ['newDefault'],
},
});
});

expect(variable.state.value).toEqual(['newDefault']);
expect(variable.state.text).toEqual(['newDefault']);
});

it('should update value when defaultValue changes', async () => {
const { variable } = setupTest({
defaultValue: {
value: ['defaultVal1'],
text: ['defaultVal1'],
},
});

expect(variable.state.value).toEqual(['defaultVal1']);

act(() => {
variable.setState({
defaultValue: {
value: ['newDefault'],
text: ['newDefault'],
},
});
});

expect(variable.state.value).toEqual(['newDefault']);
expect(variable.state.text).toEqual(['newDefault']);
});

it('should reset value when defaultValue is cleared', async () => {
const { variable } = setupTest({
defaultValue: {
value: ['defaultVal1'],
text: ['defaultVal1'],
},
});

expect(variable.state.value).toEqual(['defaultVal1']);

act(() => {
variable.setState({ defaultValue: undefined });
});

expect(variable.state.value).toEqual([]);
});

it('should work with browser history action on user action', () => {
const { variable } = setupTest({
defaultOptions: [
Expand Down
12 changes: 0 additions & 12 deletions packages/scenes/src/variables/groupby/GroupByVariable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,19 +228,7 @@ export class GroupByVariable extends MultiValueVariable<GroupByVariableState> {
}
}

const sub = this.subscribeToState((newState, prevState) => {
if (!isEqual(newState.defaultValue, prevState.defaultValue)) {
if (newState.defaultValue) {
this.changeValueTo(newState.defaultValue.value, newState.defaultValue.text, false);
} else {
this.changeValueTo([], [], false);
}
}
});

return () => {
sub.unsubscribe();

if (this.state.defaultValue) {
this.restoreDefaultValues();
}
Expand Down