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.

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

Advanced Timeline Filtering #1535

Merged
merged 108 commits into from
Jan 18, 2025
Merged
Changes from 1 commit
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
059e43c
WIP
AaronPlave Oct 21, 2024
2f2aae2
Fixes for spans
AaronPlave Oct 30, 2024
3b160fb
Componentize editor section headers. Remove unused styles.
AaronPlave Oct 31, 2024
cb35339
Refactoring, fixing, improving timeline editor
AaronPlave Oct 31, 2024
2d5670e
Add icon
AaronPlave Nov 5, 2024
9fa3a7e
Add svelte dragging library
AaronPlave Nov 5, 2024
93bbb42
Style refactor
AaronPlave Nov 5, 2024
70ec0fd
Make menu items tab focusable
AaronPlave Nov 5, 2024
1eb7d32
Style tweak
AaronPlave Nov 5, 2024
003ee3f
WIP activity layer filtering
AaronPlave Nov 5, 2024
54181b1
style refactor
AaronPlave Nov 5, 2024
159a85d
Get default activity arguments during plan load
AaronPlave Nov 12, 2024
77c6880
Potentially remove unused input workaround
AaronPlave Nov 12, 2024
dcd2b01
WIP filtering
AaronPlave Nov 12, 2024
eadd04b
Basic manual type selection list filtering
AaronPlave Nov 12, 2024
77c826f
add cssgrid to activity filter builder
AaronPlave Nov 12, 2024
171af59
Bring back resource editing in old form for now
AaronPlave Nov 12, 2024
2445ac7
Remove all layer fixes
AaronPlave Nov 12, 2024
57bb8ae
Style fix
AaronPlave Nov 12, 2024
f2fff0f
Refactor
AaronPlave Nov 12, 2024
2687eb9
Show an indication dot when an activity layer has active filters
AaronPlave Nov 12, 2024
011b4c9
Show resulting type and instance counts
AaronPlave Nov 12, 2024
0f44251
Greater/less than support
AaronPlave Nov 12, 2024
7d1c57b
Remove log
AaronPlave Nov 12, 2024
1daa49f
use > and <
AaronPlave Nov 12, 2024
05476c7
Reactivity fix
AaronPlave Nov 12, 2024
524def4
Support boolean comparison
AaronPlave Nov 12, 2024
db7e950
Input filtering
AaronPlave Nov 21, 2024
673d006
Bug fix
AaronPlave Nov 21, 2024
f433e7a
Support for min col and row css grid sizing
AaronPlave Nov 21, 2024
f1de8c7
Add derived subsystem tags store. Fix subsystem tags filtering.
AaronPlave Nov 21, 2024
9cb4527
Tooltip tweaks
AaronPlave Nov 21, 2024
4da995d
Fixes
AaronPlave Nov 21, 2024
e3017f3
Scheduling goal id filtering WIP support
AaronPlave Nov 21, 2024
f0aa1f8
Manual type selection menu positioning fix
AaronPlave Nov 21, 2024
37ff973
Filter parameter possibilities by resulting types if any. List all re…
AaronPlave Nov 22, 2024
38a0d26
Tweak SearchableDropdown to be more like a dropdown
AaronPlave Nov 22, 2024
5f4930f
Popper positioning workaround when inside css transformed parent. Use…
AaronPlave Nov 22, 2024
aa2cdc7
Fixes and refactoring
AaronPlave Nov 25, 2024
69f50fb
Fixes
AaronPlave Nov 26, 2024
9d53c0c
Support within and not within
AaronPlave Nov 26, 2024
4e37234
Apply subfilters to resulting types
AaronPlave Nov 30, 2024
f746c1d
Type fixes
AaronPlave Nov 30, 2024
c7f8cbb
Type fixes
AaronPlave Nov 30, 2024
f14c8c5
Fixes and refactoring
AaronPlave Dec 2, 2024
05661a8
Bug fix for confirm modal when adding activities to timeline
AaronPlave Dec 3, 2024
98fd3e3
Type fix
AaronPlave Dec 5, 2024
155cf02
Swap x-range icon
AaronPlave Dec 17, 2024
c0351cc
Add left slot to MenuHeader
AaronPlave Dec 17, 2024
c7dc812
Refactor SearchableDropdown to allow for multiple options if requested
AaronPlave Dec 17, 2024
53531ae
Style and functionality updates for all layers
AaronPlave Dec 17, 2024
466cd8a
Bug fixes
AaronPlave Dec 17, 2024
b84a6d7
Bug fixes
AaronPlave Dec 17, 2024
d800fc4
Use resource layer name as override on SearchableDropdown selected op…
AaronPlave Dec 17, 2024
2d50346
Show units for duration, int, and real parameters. Filter window drag…
AaronPlave Dec 17, 2024
6d24704
Show all activities when no filters exist on layer. Bug fix.
AaronPlave Dec 17, 2024
b6128a1
Virtualization of SearchableDropdown. Fixes.
AaronPlave Dec 18, 2024
18fdadf
View migration to v2
AaronPlave Dec 19, 2024
67355d0
Prevent highlight on drag
AaronPlave Dec 19, 2024
f737b96
Improve auto width sizing of SearchableDropdown
AaronPlave Dec 19, 2024
d93631c
Fixes
AaronPlave Dec 20, 2024
ec17da0
Type fix
AaronPlave Dec 20, 2024
033e250
Type fixes
AaronPlave Dec 20, 2024
6dbc718
Type fix
AaronPlave Dec 20, 2024
0f5f5ac
Tests
AaronPlave Dec 20, 2024
ad54b7d
Remove unused code
AaronPlave Dec 20, 2024
b29da98
Type fixes
AaronPlave Dec 20, 2024
13b1d1c
Tests. Rename field Tag -> Tags. Remove unused is_one_of and is_not_o…
AaronPlave Dec 20, 2024
7b242fe
Fix
AaronPlave Dec 20, 2024
9e3acea
Test fix
AaronPlave Dec 20, 2024
8c631b9
Unit test fixes
AaronPlave Dec 23, 2024
e80a7e9
Tweak
AaronPlave Dec 23, 2024
50e488c
Aria labels
AaronPlave Dec 23, 2024
e1d9d1b
Dispatch show event
AaronPlave Dec 23, 2024
1f17984
Aria fixes
AaronPlave Dec 23, 2024
f5e15bf
Basic test for DynamicFilter
AaronPlave Dec 23, 2024
9719540
Remove log
AaronPlave Dec 23, 2024
5b0d1a7
Remove .only
AaronPlave Dec 23, 2024
9ed421e
Fixes
AaronPlave Dec 30, 2024
3c9de36
e2e tests and fixes
AaronPlave Dec 30, 2024
a618a31
Remove pause in e2e test
AaronPlave Dec 30, 2024
689df1e
Test fix
AaronPlave Dec 31, 2024
32b5f84
Test fixes
AaronPlave Dec 31, 2024
cff40ec
Fixes
AaronPlave Dec 31, 2024
67d870e
Remove logs
AaronPlave Dec 31, 2024
98b5155
Add tooltip
AaronPlave Jan 2, 2025
538657c
Use Activity Layer instead of All Activities as default activity laye…
AaronPlave Jan 6, 2025
d10852f
Change global filters to other filters
AaronPlave Jan 6, 2025
d3161f4
Turn off native autosuggest in various inputs. Add string input for t…
AaronPlave Jan 6, 2025
2312e97
Fix within input values
AaronPlave Jan 6, 2025
f0bb09b
Filtering bug fixes and refactoring
AaronPlave Jan 6, 2025
2378295
Resource layer tests
AaronPlave Jan 6, 2025
f221972
Remove unused async
AaronPlave Jan 15, 2025
7b8578f
Remove comment
AaronPlave Jan 15, 2025
6e0f669
Remove comment
AaronPlave Jan 15, 2025
3edebf8
Tweaks
AaronPlave Jan 15, 2025
79ae261
Rename aria-label
AaronPlave Jan 15, 2025
33a3878
Fix test
AaronPlave Jan 15, 2025
629935f
Move enums to separate file
AaronPlave Jan 15, 2025
c10db80
Remove unused export
AaronPlave Jan 15, 2025
6ab6bc4
Remove unused exports
AaronPlave Jan 15, 2025
c813093
More tests
AaronPlave Jan 15, 2025
30357de
Fix
AaronPlave Jan 15, 2025
0260d96
Test fix
AaronPlave Jan 15, 2025
061f641
Filtering fixes
AaronPlave Jan 15, 2025
9b66060
Remove comment
AaronPlave Jan 17, 2025
50a15e0
Remove comment
AaronPlave Jan 17, 2025
04bf0d6
Refactor
AaronPlave Jan 17, 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
Prev Previous commit
Next Next commit
Fix test
AaronPlave committed Jan 17, 2025
commit 33a3878845b1320ccbe7219fe109bbfa71545a13
6 changes: 2 additions & 4 deletions e2e-tests/tests/timeline-view-editing.test.ts
Original file line number Diff line number Diff line change
@@ -131,11 +131,11 @@ test.describe.serial('Timeline View Editing', () => {
await activityLayerEditor
.locator('.timeline-layer-editor')
.first()
.getByLabel('activity-filter-builder-trigger')
.getByLabel('Toggle activity filter builder modal')
.click();

// Expect that the modal is present
const modal = activityLayerEditor.getByLabel('activity-filter-builder');
const modal = activityLayerEditor.getByRole('dialog');
expect(modal).toBeDefined();

// Expect that layer name is showing in the name input
@@ -261,8 +261,6 @@ test.describe.serial('Timeline View Editing', () => {
const newYAxisCount = await yAxisEditor.locator('.timeline-y-axis').count();
expect(newYAxisCount - existingYAxesCount).toEqual(1);

await page.pause();

// Select a resource
await resourceLayerEditor.getByRole('combobox').click();
await resourceLayerEditor.getByRole('menuitem', { name: '/peel' }).waitFor({ state: 'attached' });