From 1ffe5ae605a2bf7f33f90e6f466c1df37f1faa83 Mon Sep 17 00:00:00 2001 From: Hironsan Date: Wed, 15 Jul 2020 10:02:06 +0900 Subject: [PATCH] Enable to validate a page number --- frontend/layouts/annotation.vue | 9 +++------ frontend/pages/projects/_id/sequence-labeling/index.vue | 4 ++++ .../pages/projects/_id/sequence-to-sequence/index.vue | 4 ++++ .../pages/projects/_id/text-classification/index.vue | 4 ++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/frontend/layouts/annotation.vue b/frontend/layouts/annotation.vue index 73df2f5c..f4240300 100644 --- a/frontend/layouts/annotation.vue +++ b/frontend/layouts/annotation.vue @@ -91,6 +91,7 @@ export default { ApproveButton, MetadataBox }, + data() { return { drawerLeft: null, @@ -104,10 +105,10 @@ export default { ...mapGetters('documents', ['currentDoc', 'approved']), page: { get() { - return parseInt(this.$route.query.page, 10) + return Math.min(parseInt(this.$route.query.page, 10), this.total) }, set(newValue) { - const value = parseInt(newValue, 10) + const value = Math.min(parseInt(newValue, 10), this.total) this.$router.push({ query: { isChecked: this.$route.query.isChecked, @@ -188,10 +189,6 @@ export default { filterName: this.getFilterOption }) } - }, - - validate({ params, query }) { - return /^\d+$/.test(params.id) && /^\d+$/.test(query.page) } } diff --git a/frontend/pages/projects/_id/sequence-labeling/index.vue b/frontend/pages/projects/_id/sequence-labeling/index.vue index 081b0800..90522fec 100644 --- a/frontend/pages/projects/_id/sequence-labeling/index.vue +++ b/frontend/pages/projects/_id/sequence-labeling/index.vue @@ -14,6 +14,10 @@ export default { components: { EntityItemBox + }, + + validate({ params, query }) { + return /^\d+$/.test(params.id) && /^\d+$/.test(query.page) } } diff --git a/frontend/pages/projects/_id/sequence-to-sequence/index.vue b/frontend/pages/projects/_id/sequence-to-sequence/index.vue index dff6d9d8..1762e5f3 100644 --- a/frontend/pages/projects/_id/sequence-to-sequence/index.vue +++ b/frontend/pages/projects/_id/sequence-to-sequence/index.vue @@ -10,6 +10,10 @@ export default { components: { Seq2seqContainer + }, + + validate({ params, query }) { + return /^\d+$/.test(params.id) && /^\d+$/.test(query.page) } } diff --git a/frontend/pages/projects/_id/text-classification/index.vue b/frontend/pages/projects/_id/text-classification/index.vue index 250070ed..6ed03b44 100644 --- a/frontend/pages/projects/_id/text-classification/index.vue +++ b/frontend/pages/projects/_id/text-classification/index.vue @@ -10,6 +10,10 @@ export default { components: { TextClassification + }, + + validate({ params, query }) { + return /^\d+$/.test(params.id) && /^\d+$/.test(query.page) } }