-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: unified actions selectors (#2749)
* feat: init context sharing * example * fix: lint issue * cleanup * ex refactor wip * wip refactor * cleanup * type * fix: fork sq * cleanup * cleanup * move value check to enabled prop * remove business model * remove business model * fix merge * fix: type error * fix: types * feat: consolidate action code * fix: remove unused * fix: added comment * fix: optional search results
- Loading branch information
Showing
8 changed files
with
410 additions
and
166 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,8 @@ | |
"@playwright/test": "^1.25.0", | ||
"@sveltejs/adapter-static": "^1.0.0", | ||
"@sveltejs/kit": "^1.5.0", | ||
"@tanstack/svelte-query": "^4.27.0", | ||
"@rilldata/svelte-query": "^4.29.20-0.0.1", | ||
"@tanstack/svelte-query": "npm:@rilldata/[email protected]", | ||
"@types/cookie": "^0.5.1", | ||
"@typescript-eslint/eslint-plugin": "^5.27.0", | ||
"@typescript-eslint/parser": "^5.27.0", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,7 +30,8 @@ | |
"@storybook/svelte": "^7.0.18", | ||
"@storybook/svelte-vite": "^7.0.18", | ||
"@storybook/testing-library": "^0.0.14-next.2", | ||
"@tanstack/svelte-query": "^4.27.0", | ||
"@rilldata/svelte-query": "^4.29.20-0.0.1", | ||
"@tanstack/svelte-query": "npm:@rilldata/[email protected]", | ||
"@testing-library/svelte": "^3.2.2", | ||
"@typescript-eslint/eslint-plugin": "^5.27.0", | ||
"@typescript-eslint/parser": "^5.27.0", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,113 @@ | ||
import { get } from "svelte/store"; | ||
import type { StateManagers } from "../state-managers/state-managers"; | ||
import { cancelDashboardQueries } from "../dashboard-queries"; | ||
import { removeIfExists } from "@rilldata/web-common/lib/arrayUtils"; | ||
|
||
export function clearFilterForDimension( | ||
ctx: StateManagers, | ||
dimensionId: string, | ||
include: boolean | ||
) { | ||
const metricViewName = get(ctx.metricsViewName); | ||
cancelDashboardQueries(ctx.queryClient, metricViewName); | ||
ctx.updateDashboard((dashboard) => { | ||
if (include) { | ||
removeIfExists( | ||
dashboard.filters.include, | ||
(dimensionValues) => dimensionValues.name === dimensionId | ||
); | ||
} else { | ||
removeIfExists( | ||
dashboard.filters.exclude, | ||
(dimensionValues) => dimensionValues.name === dimensionId | ||
); | ||
} | ||
}); | ||
} | ||
|
||
export function clearAllFilters(ctx: StateManagers) { | ||
const filters = get(ctx.dashboardStore).filters; | ||
const hasFilters = | ||
(filters && filters.include.length > 0) || filters.exclude.length > 0; | ||
const metricViewName = get(ctx.metricsViewName); | ||
if (hasFilters) { | ||
cancelDashboardQueries(ctx.queryClient, metricViewName); | ||
ctx.updateDashboard((dashboard) => { | ||
dashboard.filters.include = []; | ||
dashboard.filters.exclude = []; | ||
dashboard.dimensionFilterExcludeMode.clear(); | ||
}); | ||
} | ||
} | ||
|
||
export function toggleDimensionValue( | ||
ctx: StateManagers, | ||
dimensionName: string, | ||
dimensionValue: string | ||
) { | ||
const metricViewName = get(ctx.metricsViewName); | ||
cancelDashboardQueries(ctx.queryClient, metricViewName); | ||
|
||
ctx.updateDashboard((dashboard) => { | ||
const relevantFilterKey = dashboard.dimensionFilterExcludeMode.get( | ||
dimensionName | ||
) | ||
? "exclude" | ||
: "include"; | ||
|
||
const dimensionEntryIndex = dashboard.filters[relevantFilterKey].findIndex( | ||
(filter) => filter.name === dimensionName | ||
); | ||
|
||
if (dimensionEntryIndex >= 0) { | ||
if ( | ||
removeIfExists( | ||
dashboard.filters[relevantFilterKey][dimensionEntryIndex].in, | ||
(value) => value === dimensionValue | ||
) | ||
) { | ||
if ( | ||
dashboard.filters[relevantFilterKey][dimensionEntryIndex].in | ||
.length === 0 | ||
) { | ||
dashboard.filters[relevantFilterKey].splice(dimensionEntryIndex, 1); | ||
} | ||
return; | ||
} | ||
|
||
dashboard.filters[relevantFilterKey][dimensionEntryIndex].in.push( | ||
dimensionValue | ||
); | ||
} else { | ||
dashboard.filters[relevantFilterKey].push({ | ||
name: dimensionName, | ||
in: [dimensionValue], | ||
}); | ||
} | ||
}); | ||
} | ||
|
||
export function toggleFilterMode(ctx: StateManagers, dimensionName: string) { | ||
const metricViewName = get(ctx.metricsViewName); | ||
cancelDashboardQueries(ctx.queryClient, metricViewName); | ||
ctx.updateDashboard((dashboard) => { | ||
const exclude = dashboard.dimensionFilterExcludeMode.get(dimensionName); | ||
dashboard.dimensionFilterExcludeMode.set(dimensionName, !exclude); | ||
|
||
const relevantFilterKey = exclude ? "exclude" : "include"; | ||
const otherFilterKey = exclude ? "include" : "exclude"; | ||
|
||
const otherFilterEntryIndex = dashboard.filters[ | ||
relevantFilterKey | ||
].findIndex((filter) => filter.name === dimensionName); | ||
// if relevant filter is not present then return | ||
if (otherFilterEntryIndex === -1) return; | ||
|
||
// push relevant filters to other filter | ||
dashboard.filters[otherFilterKey].push( | ||
dashboard.filters[relevantFilterKey][otherFilterEntryIndex] | ||
); | ||
// remove entry from relevant filter | ||
dashboard.filters[relevantFilterKey].splice(otherFilterEntryIndex, 1); | ||
}); | ||
} |
Oops, something went wrong.