Skip to content

BUGFIX: Update default datasource to not be preselected when null #148

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

Open
ModupeD wants to merge 2 commits into
base: main
Choose a base branch
from
Open

BUGFIX: Update default datasource to not be preselected when null #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
718cb88
BUGFIX: Upate default datasource to not be preselected when there is …
ModupeD May 29, 2026
e687caf
BUGFIX: Clear default datasource items in tests when no default is set
ModupeD Jun 1, 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
28 changes: 3 additions & 25 deletions dashboards/src/context/DatasourceStoreProvider.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,7 @@ describe('DatasourceStoreProvider::useListDatasourceSelectItems', () => {
{
editLink: undefined,
group: `Default Datasource Plugin for ${FAKE_PLUGIN_NAME}`,
items: [
{
name: 'Default (localDatasourceA from dashboard)',
selector: {
kind: FAKE_PLUGIN_NAME,
},
},
],
items: [],
},
{
editLink: undefined,
Expand Down Expand Up @@ -297,15 +290,7 @@ describe('DatasourceStoreProvider::useListDatasourceSelectItems', () => {
{
editLink: undefined,
group: `Default Datasource Plugin for ${FAKE_PLUGIN_NAME}`,
items: [
{
// This is the default datasource because first of the list
name: 'Default (datasourceA from project)',
selector: {
kind: FAKE_PLUGIN_NAME,
},
},
],
items: [],
},
{
editLink: '/projects/perses/datasources',
Expand Down Expand Up @@ -458,14 +443,7 @@ describe('DatasourceStoreProvider::useListDatasourceSelectItems', () => {
{
editLink: undefined,
group: `Default Datasource Plugin for ${FAKE_PLUGIN_NAME}`,
items: [
{
name: 'Default (localDatasourceA from dashboard)',
selector: {
kind: FAKE_PLUGIN_NAME,
},
},
],
items: [],
},
{
editLink: undefined,
Expand Down
2 changes: 1 addition & 1 deletion dashboards/src/context/DatasourceStoreProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ function buildDatasourceSelectItemGroups(pluginDisplayName: string): {
usedNames.add(selectorName);

const isExplicitDefault = !isOverridden && spec.default && !explicitDefaultAdded;
if (results[0] && (isFirst || isExplicitDefault)) {
if (results[0] && isExplicitDefault) {
// If we haven't added a default yet and this is a default, add default option to the beginning of the results
results[0].items = [
{
Expand Down