Skip to content
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

[DEV-10402] Set Default Filter Value #1926

Merged
merged 2 commits into from
Feb 14, 2025
Merged

[DEV-10402] Set Default Filter Value #1926

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
1d1a5e1
[DEV-10402] add default dashboard filter value
adamdoe Feb 12, 2025
815f673
[DEV-10402] resolve feedback
adamdoe Feb 12, 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
2 changes: 1 addition & 1 deletion packages/core/components/Filters/Filters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const useFilters = props => {
// Overwrite filterItem.values since thats what we map through in the editor panel
filterItem.values = updatedValues
filterItem.orderedValues = updatedValues
filterItem.active = updatedValues[0]
if (!filterItem.active) filterItem.active = updatedValues[0]
filterItem.order = 'cust'

// Update the filters
Expand Down
4 changes: 2 additions & 2 deletions packages/dashboard/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
</head>

<body>
<div class="react-container" data-config="/examples/private/bird-flu-2.json"></div>
<div class="react-container" data-config="/examples/private/bird-flu.json"></div>
<!-- <div class="react-container" data-config="/examples/wastewater.json"></div> -->
<!-- <div class="react-container" data-config="/examples/private/bird-flu.json"></div> -->
<!-- <div class="react-container" data-config="/examples/bump-chart.json"></div> -->
<!-- <div class="react-container" data-config="/examples/full-dashboard.json"></div> -->
<div class="react-container" data-config="/examples/dashboard-gallery.json"></div>
Expand Down
8 changes: 8 additions & 0 deletions ...hboard/src/components/DashboardFilters/DashboardFiltersEditor/components/FilterEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,14 @@ const FilterEditor: React.FC<FilterEditorProps> = ({ filter, filterIndex, config
</select>
</label>

<Select
value={filter.active}
options={config.dashboard.sharedFilters[filterIndex].values}
updateField={(_section, _subSection, _key, value) => updateFilterProp('active', value)}
label={'Filter Default Value'}
initial={'Select'}
/>

<Select
value={filter.order || 'column'}
options={filterOrderOptions}
Expand Down
2 changes: 1 addition & 1 deletion packages/dashboard/src/helpers/addValuesToDashboardFilters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const addValuesToDashboardFilters = (
filterCopy.active = active.filter(val => defaultValues.includes(val))
} else {
const defaultLabel = filters.find(filter => filter.resetLabel)
const defaultValue = defaultLabel ? defaultLabel.resetLabel : filterCopy.values?.[0] || filterCopy.active
const defaultValue = defaultLabel ? defaultLabel.resetLabel : filterCopy.active || filterCopy.values[0]
filterCopy.active = defaultValue
}
}
Expand Down