Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DataCatalog
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eFlows4HPC WP2
DataCatalog
Commits
c0479f33
Commit
c0479f33
authored
2 years ago
by
Christian Boettcher
Browse files
Options
Downloads
Patches
Plain Diff
add filters to web frontend
parent
d7a08ea5
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#113269
passed
2 years ago
Stage: test
Stage: build
Stage: deploy
Stage: test-deployment
Stage: cleanup
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
frontend/js/apicalls.js
+80
-4
80 additions, 4 deletions
frontend/js/apicalls.js
frontend/templates/storage_content.html.jinja
+19
-1
19 additions, 1 deletion
frontend/templates/storage_content.html.jinja
with
99 additions
and
5 deletions
frontend/js/apicalls.js
+
80
−
4
View file @
c0479f33
...
@@ -23,6 +23,24 @@ function getType() {
...
@@ -23,6 +23,24 @@ function getType() {
return
type
return
type
}
}
// return the filterName attribute
function
getFilterName
()
{
var
url
=
new
URL
(
window
.
location
.
href
);
return
url
.
searchParams
.
get
(
"
filterName
"
);
}
// return the filterUrl attribute
function
getFilterUrl
()
{
var
url
=
new
URL
(
window
.
location
.
href
);
return
url
.
searchParams
.
get
(
"
filterUrl
"
);
}
// return the filterKeys attribute
function
getFilterKeys
()
{
var
url
=
new
URL
(
window
.
location
.
href
);
return
url
.
searchParams
.
getAll
(
"
filterKey
"
);
}
// set the text of the typetext element
// set the text of the typetext element
function
setTypeText
()
{
function
setTypeText
()
{
$
(
'
#typetext
'
).
text
(
getType
())
$
(
'
#typetext
'
).
text
(
getType
())
...
@@ -239,9 +257,20 @@ function getTypes() {
...
@@ -239,9 +257,20 @@ function getTypes() {
}
}
// get listing of datasets of the given type, put them in the list element (via listener)
// get listing of datasets of the given type, put them in the list element (via listener)
function
listDatasets
(
datatype
)
{
function
listDatasets
(
datatype
,
filterName
=
null
,
filterUrl
=
null
,
filterKeys
=
[])
{
var
fullUrl
=
apiUrl
+
datatype
;
var
fullUrl
=
apiUrl
+
datatype
+
"
?
"
;
console
.
log
(
"
Sending GET request to
"
+
fullUrl
+
"
for listing datasets.
"
)
if
(
filterName
!=
null
)
{
fullUrl
=
fullUrl
+
"
name=
"
+
filterName
+
"
&
"
;
}
if
(
filterUrl
!=
null
)
{
fullUrl
=
fullUrl
+
"
url=
"
+
filterUrl
+
"
&
"
;
}
if
(
filterKeys
.
length
>
0
)
{
for
(
key
in
filterKeys
)
{
fullUrl
=
fullUrl
+
"
has_key=
"
+
key
+
"
&
"
;
}
}
console
.
log
(
"
Sending GET request to
"
+
fullUrl
+
"
for listing datasets.
"
);
var
xmlhttp
=
new
XMLHttpRequest
();
var
xmlhttp
=
new
XMLHttpRequest
();
xmlhttp
.
addEventListener
(
"
loadend
"
,
setDatasetList
);
xmlhttp
.
addEventListener
(
"
loadend
"
,
setDatasetList
);
xmlhttp
.
open
(
"
GET
"
,
fullUrl
);
xmlhttp
.
open
(
"
GET
"
,
fullUrl
);
...
@@ -381,7 +410,7 @@ async function showListingOrSingleDataset() {
...
@@ -381,7 +410,7 @@ async function showListingOrSingleDataset() {
if
(
window
.
sessionStorage
.
auth_token
)
{
if
(
window
.
sessionStorage
.
auth_token
)
{
$
(
'
#addNewDatasetForm
'
).
show
();
$
(
'
#addNewDatasetForm
'
).
show
();
}
}
listDatasets
(
getType
());
listDatasets
(
getType
()
,
getFilterName
,
getFilterUrl
,
getFilterKeys
);
}
else
if
(
getId
()
==
"
new
"
)
{
}
else
if
(
getId
()
==
"
new
"
)
{
$
(
'
#datasetListTable
'
).
hide
();
$
(
'
#datasetListTable
'
).
hide
();
$
(
'
#storageTypeChooser
'
).
hide
();
$
(
'
#storageTypeChooser
'
).
hide
();
...
@@ -515,6 +544,53 @@ function saveButtonPressed() {
...
@@ -515,6 +544,53 @@ function saveButtonPressed() {
// success is handled by the xmlhttp event listener
// success is handled by the xmlhttp event listener
}
}
function
filterButtonPressed
()
{
// redirect to same page with filter queries set
var
type
=
getType
();
var
filterName
=
$
(
'
#filterFormName
'
).
val
()
var
filterUrl
=
$
(
'
#filterFormUrl
'
).
val
()
var
filterKeys
=
$
(
'
#filterFormKeys
'
).
val
()
var
filterKeyArray
=
filterKeys
.
split
(
'
,
'
)
var
filterKeyString
=
''
for
(
key
in
filterKeyArray
)
{
filterKeyString
=
filterKeyString
+
"
filterKey=
"
+
encodeURIComponent
(
filterKeyArray
[
key
])
+
"
&
"
}
var
new_location
=
window
.
location
.
href
.
split
(
'
?
'
)[
0
]
+
"
?type=
"
+
type
if
(
filterName
.
length
>
0
)
{
new_location
=
new_location
+
'
&filterName=
'
+
encodeURIComponent
(
filterName
);
}
if
(
filterUrl
.
length
>
0
)
{
new_location
=
new_location
+
'
&filterUrl=
'
+
encodeURIComponent
(
filterUrl
);
}
if
(
filterKeys
.
length
>
0
)
{
new_location
=
new_location
+
'
&
'
+
filterKeyString
;
}
window
.
location
.
href
=
new_location
}
function
prefillFilterForm
()
{
// fill the filter input elements with values from query
var
name
=
getFilterName
();
var
url
=
getFilterUrl
();
var
keys
=
getFilterKeys
();
console
.
log
(
'
name =
'
+
name
);
console
.
log
(
'
url =
'
+
url
);
console
.
log
(
'
keys =
'
+
keys
);
if
(
name
!=
null
)
$
(
'
#filterFormName
'
).
val
(
name
);
if
(
url
!=
null
)
$
(
'
#filterFormUrl
'
).
val
(
url
);
if
(
keys
.
length
>
0
)
$
(
'
#filterFormKeys
'
).
val
(
keys
.
join
());
}
function
enableButtons
(
save
,
edit
,
del
)
{
function
enableButtons
(
save
,
edit
,
del
)
{
$
(
'
#button-save
'
).
attr
(
'
disabled
'
,
!
save
);
$
(
'
#button-save
'
).
attr
(
'
disabled
'
,
!
save
);
$
(
'
#button-edit
'
).
attr
(
'
disabled
'
,
!
edit
);
$
(
'
#button-edit
'
).
attr
(
'
disabled
'
,
!
edit
);
...
...
This diff is collapsed.
Click to expand it.
frontend/templates/storage_content.html.jinja
+
19
−
1
View file @
c0479f33
...
@@ -23,6 +23,23 @@
...
@@ -23,6 +23,23 @@
</form>
</form>
<hr/>
<form class="form-inline" id="filterForm">
<label class="my-1 mr-2">Filter Datasets: </label>
<label class="sr-only" for="filterFormName">Name</label>
<input type="text" class="form-control mb-2 mr-sm-2" id="filterFormName" placeholder="Name">
<label class="sr-only" for="filterFormUrl">URL</label>
<input type="text" class="form-control mb-2 mr-sm-2" id="filterFormUrl" placeholder="URL">
<label class="sr-only" for="filterFormKeysLabel">Metadata Keys</label>
<input type="text" class="form-control mb-2 mr-sm-2" id="filterFormKeys" placeholder="Metadata Keys">
<button type="button" class="btn btn-primary mb-2" id="filterButton" onclick="filterButtonPressed()">Filter</button>
</form>
<table class="table table-hover" id="datasetListTable">
<table class="table table-hover" id="datasetListTable">
<thead>
<thead>
<tr>
<tr>
...
@@ -68,6 +85,7 @@
...
@@ -68,6 +85,7 @@
showListingOrSingleDataset();
showListingOrSingleDataset();
showElementsDependingOnLoginStatus(getInfo(false));
showElementsDependingOnLoginStatus(getInfo(false));
fillTemplateSelect();
fillTemplateSelect();
$('#templateSelector').change(updateTemplateParam)
$('#templateSelector').change(updateTemplateParam);
prefillFilterForm();
</script>
</script>
{% endblock %}
{% endblock %}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment