Skip to content

Commit

Permalink
dcache-view: modify restores page to filter and sort on path and owner
Browse files Browse the repository at this point in the history 
Motivation:

the RESTful API.  We now would like to make this available to the
user of the restores admin page.

Modification:

Move the clients and restores info into the popup; put the path
and owner:group into the main entry, along with filter and sorting
widgets.

Result:

Path and owner can now also be used in the admin page to filter/sort.

Target: master
Request: 2.0
Patch: https://rb.dcache.org/r/13693/
Depends-on: #13692
Requires-notes: yes
Requires-book: no
Acked-by: Tigran
  • Loading branch information
@alrossi
alrossi committed Sep 30, 2022
1 parent f7ace4b commit c51cb74
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 43 deletions.
5 changes: 4 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,7 @@ etc
.settings/

## Ignore
#/src/scripts/config.js
#/src/scripts/config.js

## Ignore RB
.reviewboardrc
100 changes: 58 additions & 42 deletions src/elements/dv-elements/admin/views/restores-view.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,40 +88,36 @@
<div class="details">
<table>
<tr>
<td>Path:</td>
<td>[[item.path]]</td>
<td>(Clients [[item.clients]]) (Retries [[item.retries]])</td>
<td></td>
</tr>
<tr>
<td>Error:</td>
<td>[[item.error]]</td>
</tr>
<tr>
<td>Error Message:</td>
<td>[[item.errorMessage]]</td>
<td>(Error [[item.error]]: [[item.errorMessage]]) </td>
<td></td>
</tr>
</table>
</div>
</template>

<vaadin-grid-column-group>
<template class="header">#</template>
<vaadin-grid-column width="75px">
<vaadin-grid-column width="30px">
<template class="header">Filter on:</template>
<template>[[index]]</template>
</vaadin-grid-column>
</vaadin-grid-column-group>
<vaadin-grid-column-group>
<template class="header">Path</template>
<vaadin-grid-column width="50px">
<template class="header">Info</template>
<vaadin-grid-column width="30px">
<template class="header"></template>
<template>
<paper-checkbox aria-label="Path"
<paper-checkbox aria-label="Info"
checked="{{detailsOpened}}">
</paper-checkbox>
</template>
</vaadin-grid-column>
</vaadin-grid-column-group>
<vaadin-grid-column-group resizable>
<vaadin-grid-column-group>
<template class="header">
<vaadin-grid-sorter path="pnfsid">Pnfsid
</vaadin-grid-sorter>
Expand All @@ -145,6 +141,46 @@
</template>
</vaadin-grid-column>
</vaadin-grid-column-group>
<vaadin-grid-column-group resizable>
<template class="header">
<vaadin-grid-sorter path="path">Path
</vaadin-grid-sorter>
</template>
<vaadin-grid-column width="400px">
<template class="header">
<vaadin-grid-filter id="pathFilter"
aria-label="Path"
path="path"
value="[[_filterPath]]">
<input slot="filter"
id="pathFilterInput"
placeholder="Path"
value="{{_filterPath::input}}"
focus-target/>
</vaadin-grid-filter>
</template>
<template><div style="overflow-x:auto">[[item.path]]</div></template>
</vaadin-grid-column>
</vaadin-grid-column-group>
<vaadin-grid-column-group>
<template class="header">
<vaadin-grid-sorter path="owner">Owner
</vaadin-grid-sorter>
</template>
<vaadin-grid-column width="80px">
<template class="header">
<vaadin-grid-filter aria-label="Owner"
path="owner"
value="[[_filterOwner]]">
<input slot="filter"
placeholder="owner"
value="{{_filterOwner::input}}"
focus-target/>
</vaadin-grid-filter>
</template>
<template>[[item.owner]]:[[item.ownerGroup]]</template>
</vaadin-grid-column>
</vaadin-grid-column-group>
<vaadin-grid-column-group>
<template class="header">
<vaadin-grid-sorter path="subnet">Subnet
Expand All @@ -169,7 +205,7 @@
<vaadin-grid-sorter path="pool">Pool
</vaadin-grid-sorter>
</template>
<vaadin-grid-column width="300px">
<vaadin-grid-column width="100px">
<template class="header">
<vaadin-grid-filter aria-label="Pool Candidate"
path="pool"
Expand All @@ -180,48 +216,28 @@
focus-target/>
</vaadin-grid-filter>
</template>
<template>
<span on-tap="_openPoolInfo"
class="actionable">[[item.poolCandidate]]</span>
<template><div style="overflow-x:auto">
<span on-tap="_openPoolInfo" class="actionable">[[item.poolCandidate]]</span>
</div>
</template>
</vaadin-grid-column>
</vaadin-grid-column-group>
<vaadin-grid-column-group resizable>
<vaadin-grid-column-group>
<template class="header">
<vaadin-grid-sorter path="started">Started
</vaadin-grid-sorter>
</template>
<vaadin-grid-column width="150px">
<vaadin-grid-column width="140px">
<template class="header"></template>
<template>[[item.started.formatted]]</template>
</vaadin-grid-column>
</vaadin-grid-column-group>
<vaadin-grid-column-group>
<template class="header">
<vaadin-grid-sorter path="clients">Clients
</vaadin-grid-sorter>
</template>
<vaadin-grid-column width="75px">
<template class="header"></template>
<template>[[item.clients]]</template>
</vaadin-grid-column>
</vaadin-grid-column-group>
<vaadin-grid-column-group>
<template class="header">
<vaadin-grid-sorter path="retries">Retries
</vaadin-grid-sorter>
</template>
<vaadin-grid-column width="75px">
<template class="header"></template>
<template>[[item.retries]]</template>
</vaadin-grid-column>
</vaadin-grid-column-group>
<vaadin-grid-column-group resizable>
<template class="header">
<vaadin-grid-sorter path="status">Status
</vaadin-grid-sorter>
</template>
<vaadin-grid-column width="200px">
<vaadin-grid-column width="225px">
<template class="header">
<vaadin-grid-filter aria-label="Status"
path="status"
Expand All @@ -232,7 +248,7 @@
focus-target/>
</vaadin-grid-filter>
</template>
<template>[[item.status]]</template>
<template><div style="overflow-x:auto">[[item.status]]</div></template>
</vaadin-grid-column>
</vaadin-grid-column-group>
</vaadin-grid>
Expand Down Expand Up @@ -283,7 +299,7 @@
(index) => 'restores',
(index) => '',
'restores',
4);
6);

/*
* This must be assigned only after the decorator has been
Expand Down

0 comments on commit c51cb74

Please sign in to comment.