Skip to content
This repository was archived by the owner on Sep 9, 2025. It is now read-only.

Commit e539a71

Browse files
authored
Merge pull request #223 from CogStack/vue3-data-table-remove-pagination
CU-86979v0bx : removed footers / pagination of v-data-tables.
2 parents c8fc501 + 2b9e154 commit e539a71

File tree

4 files changed

+24
-13
lines changed

4 files changed

+24
-13
lines changed

webapp/frontend/src/components/common/ProjectList.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
:items="projectItems"
1616
:hover="true"
1717
v-if="!loadingProjects"
18-
@click:row="select">
18+
@click:row="select"
19+
hide-default-footer
20+
:items-per-page="-1">
1921
<template #header.metrics>
2022
Metrics
2123
<v-tooltip activator="parent">

webapp/frontend/src/views/Home.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
:hover="true"
1515
v-if="!loadingProjects"
1616
color="primary"
17-
@click:row="selectProjectGroup">
17+
@click:row="selectProjectGroup"
18+
hide-default-footer
19+
:items-per-page="-1">
1820
<template v-slot:item.last_modified="{ item }">
1921
{{new Date(item.last_modified).toLocaleString()}}
2022
</template>

webapp/frontend/src/views/Metrics.vue

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,15 @@
4343
<div class="tab-pane">
4444
<KeepAlive>
4545
<div v-if="tab === 'user_stats'">
46-
<v-data-table :items="userStats.items" :headers="userStats.headers" :hover="true"></v-data-table>
46+
<v-data-table :items="userStats.items" :headers="userStats.headers" :hover="true" hide-default-footer
47+
:items-per-page="-1"></v-data-table>
4748
</div>
4849
</KeepAlive>
4950

5051
<KeepAlive>
5152
<div v-if="tab === 'annotations'">
52-
<v-data-table :items="annoSummary.items" :headers="annoSummary.headers" :hover="true">
53+
<v-data-table :items="annoSummary.items" :headers="annoSummary.headers" :hover="true" hide-default-footer
54+
:items-per-page="-1">
5355
<template #item.status="{ item }">
5456
<div id="status" :class="textColorClass(item.status)">
5557
{{ item.status }}
@@ -67,7 +69,8 @@
6769

6870
<KeepAlive>
6971
<div v-if="tab === 'concept_summary'">
70-
<v-data-table :items="conceptSummary.items" :headers="conceptSummary.headers">
72+
<v-data-table :items="conceptSummary.items" :headers="conceptSummary.headers" hide-default-footer
73+
:items-per-page="-1">
7174
<template #header.concept>
7275
<div>Concept</div>
7376
<v-tooltip></v-tooltip>
@@ -182,7 +185,9 @@
182185
<v-data-table :items="metaAnnsSummary.items"
183186
:headers="metaAnnsSummary.headers"
184187
:hover="true"
185-
class="meta-anno-summary">
188+
class="meta-anno-summary"
189+
hide-default-footer
190+
:items-per-page="-1">
186191
</v-data-table>
187192
</div>
188193
</KeepAlive>

webapp/frontend/src/views/MetricsHome.vue

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,23 @@
33
<v-data-table :items="reports.items"
44
:headers="reports.headers"
55
:hover="true"
6-
@click:row="loadMetrics">
6+
@click:row="loadMetrics"
7+
hide-default-footer
8+
:items-per-page="-1">
79
<template #item.projects="{ item }" >
810
<div @click.stop>
911
<v-runtime-template :template="projectsFormatter(item.projects)"></v-runtime-template>
1012
</div>
1113
</template>
1214

1315
<template #item.status="{ item }">
14-
<span v-if="item.status == 'pending'">Pending
16+
<span v-if="item.status === 'pending'">Pending
1517
<font-awesome-icon icon="fa-regular fa-clock" class="status-icon"></font-awesome-icon>
1618
</span>
17-
<span v-if="item.status == 'running'">Running
19+
<span v-if="item.status === 'running'">Running
1820
<font-awesome-icon icon="spinner" spin class="status-icon"></font-awesome-icon>
1921
</span>
20-
<span v-if="item.status == 'complete'">Complete
22+
<span v-if="item.status === 'complete'">Complete
2123
<font-awesome-icon icon="check" class="status-icon success"></font-awesome-icon>
2224
</span>
2325
</template>
@@ -41,10 +43,10 @@
4143
<h3>Confirm Delete Metrics Report</h3>
4244
</template>
4345
<template #body>
44-
<div v-if="confDeleteReportModal.status == 'running'">
46+
<div v-if="confDeleteReportModal.status === 'running'">
4547
Metrics report still running, this will cancel the running metrics report running job
4648
</div>
47-
<div v-if="confDeleteReportModal.status == 'complete'">
49+
<div v-if="confDeleteReportModal.status === 'complete'">
4850
Confirm complete metrics report deletion. To regenerate the report reselect the projects on the
4951
home screen and select metrics.
5052
</div>
@@ -126,7 +128,7 @@ export default {
126128
this.$http.delete(`/api/metrics-job/${this.confDeleteReportModal.report_id}/`).then(_ => {
127129
this.confDeleteReportModal = null
128130
this.reports.items.splice(item)
129-
}).finally(err => {
131+
}).finally(() => {
130132
this.confDeleteReportModal = null
131133
})
132134
},

0 commit comments

Comments
 (0)