Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
1998f72
refactor: improve proposal dashboard
Junjiequan Jul 4, 2025
7e80bd7
remove ProposalFilterComponent and replace with ProposalSideFilterCom…
Junjiequan Jul 15, 2025
00963d0
added side filter toggle
Junjiequan Jul 16, 2025
276f8c4
fix lint errors
Junjiequan Jul 16, 2025
560f5e5
fix unit tests
Junjiequan Jul 16, 2025
b2fcf0f
add unit tests
Junjiequan Jul 16, 2025
6061e4c
trigger pipe
Junjiequan Jul 18, 2025
669f115
fix lint error
Junjiequan Jul 18, 2025
d3bdcfa
trigger CI
Junjiequan Jul 29, 2025
ef846be
upgrade sdk version
Junjiequan Jul 29, 2025
cfd13ce
fix unit test
Junjiequan Jul 29, 2025
58c7712
fix e2e test
Junjiequan Jul 29, 2025
161adaf
cypress fix: click search button after typing
Junjiequan Jul 29, 2025
3b4b3f4
resolve merge conflicts and remove only from e2e tests
martin-trajanovski Aug 4, 2025
c50bcbf
Merge branch 'master' into SWAP-4818-scicat-fe-proposals-filters-eval…
martin-trajanovski Aug 5, 2025
cef9b35
refactor: make dataset filters use the shared filters and cleanup all…
martin-trajanovski Aug 6, 2025
8c5309b
Merge branch 'master' of https://github.com/SciCatProject/frontend in…
martin-trajanovski Aug 7, 2025
e861d02
more cleanup and fixes for the daterange filters
martin-trajanovski Aug 7, 2025
2d92289
more cleanup and fixes for the filters
martin-trajanovski Aug 7, 2025
6733f0a
add number range field
martin-trajanovski Aug 7, 2025
be3ada2
fix some numeric range filter issues
martin-trajanovski Aug 8, 2025
d8415b3
some more improvements in the actions
martin-trajanovski Aug 8, 2025
f8f0c9d
try to merge the filters if there are changes in the config
martin-trajanovski Aug 8, 2025
468890f
resolve conflicts
martin-trajanovski Aug 12, 2025
db4e0ac
resolve conflicts
martin-trajanovski Aug 12, 2025
5ebcbb8
more cleanup and unit tests fix
martin-trajanovski Aug 12, 2025
6f200e3
fix some linting errors
martin-trajanovski Aug 13, 2025
1137c30
fix more linting issues
martin-trajanovski Aug 13, 2025
7f7467a
more linting issues
martin-trajanovski Aug 13, 2025
1b2ac38
final linting issues push
martin-trajanovski Aug 13, 2025
15ae14a
last linting error
martin-trajanovski Aug 13, 2025
73ea514
resolve conflicts
martin-trajanovski Aug 15, 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
60 changes: 42 additions & 18 deletions CI/e2e/frontend.config.e2e.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,6 @@
"authorization": ["#datasetAccess", "#datasetPublic"]
}
],
"labelMaps": {
"filters": {
"LocationFilter": "Location",
"PidFilter": "Pid",
"GroupFilter": "Group",
"TypeFilter": "Type",
"KeywordFilter": "Keyword",
"DateRangeFilter": "Start Date - End Date",
"TextFilter": "Text"
}
},
"defaultDatasetsListSettings": {
"columns": [
{
Expand Down Expand Up @@ -199,13 +188,48 @@
}
],
"filters": [
{ "LocationFilter": true },
{ "PidFilter": true },
{ "GroupFilter": true },
{ "TypeFilter": true },
{ "KeywordFilter": true },
{ "DateRangeFilter": true },
{ "TextFilter": true }
{
"key": "creationLocation",
"label": "Location",
"type": "multiSelect",
"description": "Filter by creation location on the dataset",
"enabled": true
},
{
"key": "pid",
"label": "Pid",
"type": "text",
"description": "Filter by dataset pid",
"enabled": true
},
{
"key": "ownerGroup",
"label": "Group",
"type": "multiSelect",
"description": "Filter by owner group of the dataset",
"enabled": true
},
{
"key": "type",
"label": "Type",
"type": "multiSelect",
"description": "Filter by dataset type",
"enabled": true
},
{
"key": "keywords",
"label": "Keyword",
"type": "multiSelect",
"description": "Filter by keywords in the dataset",
"enabled": true
},
{
"key": "creationTime",
"label": "Creation Time",
"type": "dateRange",
"description": "Filter by creation time of the dataset",
"enabled": true
}
],
"conditions": []
},
Expand Down
Loading
Loading