Skip to content

Commit 1da6adc

Browse files
committed
token pagination for volumes
1 parent 5ddaa0d commit 1da6adc

File tree

6 files changed

+32
-10
lines changed

6 files changed

+32
-10
lines changed

.prettierignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
views/partials/header.ejs
2-
views/home.ejs
1+
*.ejs

.prettierrc.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"arrowParens": "always",
3+
"bracketSpacing": true,
4+
"printWidth": 100
5+
}

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
"nodemon": "^1.19.4"
2929
},
3030
"nodemonConfig": {
31-
"ignore": ["nogit/*"]
31+
"ignore": [
32+
"nogit/*"
33+
]
3234
}
33-
3435
}

routes/volumes.js

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ const router = express.Router();
33
const request = require("request");
44
const illumina = require("../utils/illumina");
55
const utils = require("../utils/utils");
6-
const pageSize = 100;
76
const request_opts = illumina.request_opts();
87

98
router.get("/", (req, res) => {

views/gds/files.ejs

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
</tr>
2121
</thead>
2222
<tbody>
23-
<% fs = files["items"] %> <% for (let i = 0; i < fs.length; i++) { %>
23+
<% fs = files["items"]; %>
24+
<% delete qs.pageSize; %>
25+
<% for (let i = 0; i < fs.length; i++) { %>
2426
<tr>
2527
<td><%= `${i + 1}.` %></td>
2628
<td><%= fs[i].path %></td>

views/gds/volumes.ejs

+20-4
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,29 @@
1515
</tr>
1616
</thead>
1717
<tbody>
18-
<% vols = volumes["items"] %> <% for (let i = 0; i < vols.length; i++) { %>
18+
<% vols = volumes["items"]; %>
19+
<% firstPageToken = volumes["firstPageToken"] %>
20+
<% nextPageToken = volumes["nextPageToken"] %>
21+
<% prevPageToken = volumes["prevPageToken"] %>
22+
<ul>
23+
<% if (firstPageToken) {%>
24+
<li><a href="/volumes?pageToken=<%= firstPageToken %>">FirstPage</a></li>
25+
<% } %>
26+
<% if (nextPageToken) {%>
27+
<li><a href="/volumes?pageToken=<%= nextPageToken %>">NextPage</a></li>
28+
<% } %>
29+
<% if (prevPageToken) {%>
30+
<li><a href="/volumes?pageToken=<%= prevPageToken %>">PreviousPage</a></li>
31+
<% } %>
32+
</ul>
33+
34+
<% for (let i = 0; i < vols.length; i++) { %>
1935
<tr>
2036
<td><%= `${i + 1}.` %></td>
2137
<td>
22-
<a href="/files?volume.name=<%= vols[i].name %>&pageSize=1000"
23-
><%= vols[i].name %></a
24-
>
38+
<a href="/files?volume.name=<%= vols[i].name %>&pageSize=1000">
39+
<%= vols[i].name %>
40+
</a>
2541
</td>
2642
<td title="<%= vols[i].createdBy %>">
2743
<%= id2username(vols[i].createdBy) %>

0 commit comments

Comments
 (0)