From e22e2b4107b4f85e1c8994031de5df95d6559554 Mon Sep 17 00:00:00 2001 From: Kirill Stytsenko <kirill@styts.com> Date: Tue, 15 Feb 2022 17:43:34 +0100 Subject: [PATCH] Use :to instead of href in links (recover lost commit `8febbcba`) Former-commit-id: b29e9ebdde8ad01b8b7f506f7452b8a05ea995f6 --- .../_container_id/database/_database_id/admin.vue | 8 ++++++-- .../_container_id/database/_database_id/info.vue | 8 ++++++-- .../_database_id/query/_query_id/index.vue | 8 ++++---- .../database/_database_id/query/create.vue | 14 +++++++++++--- .../database/_database_id/query/index.vue | 8 ++++++-- .../_database_id/table/_table_id/index.vue | 8 ++++---- .../database/_database_id/table/import.vue | 8 ++++++-- .../database/_database_id/table/index.vue | 4 ++-- fda-ui/pages/container/index.vue | 2 +- 9 files changed, 46 insertions(+), 22 deletions(-) diff --git a/fda-ui/pages/container/_container_id/database/_database_id/admin.vue b/fda-ui/pages/container/_container_id/database/_database_id/admin.vue index e1ca5a02b0..43ec7f4365 100644 --- a/fda-ui/pages/container/_container_id/database/_database_id/admin.vue +++ b/fda-ui/pages/container/_container_id/database/_database_id/admin.vue @@ -48,8 +48,12 @@ export default { dialogDelete: false, confirm: null, items: [ - { text: 'Databases', to: '/databases', activeClass: '' }, - { text: `${this.$route.params.database_id}`, to: `/databases/${this.$route.params.database_id}/info`, activeClass: '' } + { text: 'Databases', to: '/container', activeClass: '' }, + { + text: `${this.$route.params.database_id}`, + to: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/info`, + activeClass: '' + } ] } }, diff --git a/fda-ui/pages/container/_container_id/database/_database_id/info.vue b/fda-ui/pages/container/_container_id/database/_database_id/info.vue index 5b6a6cea93..3186fa34dc 100644 --- a/fda-ui/pages/container/_container_id/database/_database_id/info.vue +++ b/fda-ui/pages/container/_container_id/database/_database_id/info.vue @@ -39,8 +39,12 @@ export default { return { loading: false, items: [ - { text: 'Databases', href: '/container' }, - { text: `${this.$route.params.database_id}`, href: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/info` } + { text: 'Databases', to: '/container', activeClass: '' }, + { + text: `${this.$route.params.database_id}`, + to: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/info`, + activeClass: '' + } ] } }, diff --git a/fda-ui/pages/container/_container_id/database/_database_id/query/_query_id/index.vue b/fda-ui/pages/container/_container_id/database/_database_id/query/_query_id/index.vue index 2cc72b4c27..d40ffb92e2 100644 --- a/fda-ui/pages/container/_container_id/database/_database_id/query/_query_id/index.vue +++ b/fda-ui/pages/container/_container_id/database/_database_id/query/_query_id/index.vue @@ -92,10 +92,10 @@ export default { data () { return { items: [ - { text: 'Databases', href: '/container' }, - { text: `${this.$route.params.database_id}`, href: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}` }, - { text: 'Queries', href: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/query` }, - { text: `${this.$route.params.query_id}`, href: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/query/${this.$route.params.query_id}` } + { text: 'Databases', to: '/container', activeClass: '' }, + { text: `${this.$route.params.database_id}`, to: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}`, activeClass: '' }, + { text: 'Queries', to: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/query`, activeClass: '' }, + { text: `${this.$route.params.query_id}`, to: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/query/${this.$route.params.query_id}`, activeClass: '' } ], query: { id: this.$route.params.query_id, diff --git a/fda-ui/pages/container/_container_id/database/_database_id/query/create.vue b/fda-ui/pages/container/_container_id/database/_database_id/query/create.vue index 2e60a02cd7..1fa5ca66e0 100644 --- a/fda-ui/pages/container/_container_id/database/_database_id/query/create.vue +++ b/fda-ui/pages/container/_container_id/database/_database_id/query/create.vue @@ -10,9 +10,17 @@ export default { data () { return { items: [ - { text: 'Databases', href: '/container' }, - { text: `${this.$route.params.database_id}`, href: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/info` }, - { text: 'Queries', href: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/query` } + { text: 'Databases', to: '/container', activeClass: '' }, + { + text: `${this.$route.params.database_id}`, + to: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/info`, + activeClass: '' + }, + { + text: 'Queries', + to: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/query`, + activeClass: '' + } ] } }, diff --git a/fda-ui/pages/container/_container_id/database/_database_id/query/index.vue b/fda-ui/pages/container/_container_id/database/_database_id/query/index.vue index 9adfcbe3b6..625dc6eab8 100644 --- a/fda-ui/pages/container/_container_id/database/_database_id/query/index.vue +++ b/fda-ui/pages/container/_container_id/database/_database_id/query/index.vue @@ -12,8 +12,12 @@ export default { data () { return { items: [ - { text: 'Databases', href: '/container' }, - { text: `${this.$route.params.database_id}`, href: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/query` } + { text: 'Databases', to: '/container', activeClass: '' }, + { + text: `${this.$route.params.database_id}`, + to: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/query`, + activeClass: '' + } ] } }, diff --git a/fda-ui/pages/container/_container_id/database/_database_id/table/_table_id/index.vue b/fda-ui/pages/container/_container_id/database/_database_id/table/_table_id/index.vue index a56278bbe7..b8b81b0e9a 100644 --- a/fda-ui/pages/container/_container_id/database/_database_id/table/_table_id/index.vue +++ b/fda-ui/pages/container/_container_id/database/_database_id/table/_table_id/index.vue @@ -86,10 +86,10 @@ export default { description: null }, items: [ - { text: 'Databases', href: '/container' }, - { text: `${this.$route.params.database_id}`, href: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/info` }, - { text: 'Tables', href: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/table` }, - { text: `${this.$route.params.table_id}`, href: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/table/${this.$route.params.table_id}` } + { text: 'Databases', to: '/container', activeClass: '' }, + { text: `${this.$route.params.database_id}`, to: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/info`, activeClass: '' }, + { text: 'Tables', to: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/table`, activeClass: '' }, + { text: `${this.$route.params.table_id}`, to: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/table/${this.$route.params.table_id}`, activeClass: '' } ], headers: [], rows: [] diff --git a/fda-ui/pages/container/_container_id/database/_database_id/table/import.vue b/fda-ui/pages/container/_container_id/database/_database_id/table/import.vue index 438f24ca4e..f9b0e65e51 100644 --- a/fda-ui/pages/container/_container_id/database/_database_id/table/import.vue +++ b/fda-ui/pages/container/_container_id/database/_database_id/table/import.vue @@ -237,8 +237,12 @@ export default { '#' ], items: [ - { text: 'Databases', href: '/container' }, - { text: `${this.$route.params.database_id}`, href: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/info` } + { text: 'Databases', to: '/container', activeClass: '' }, + { + text: `${this.$route.params.database_id}`, + to: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/info`, + activeClass: '' + } ], rules: { required: value => !!value || 'Required', diff --git a/fda-ui/pages/container/_container_id/database/_database_id/table/index.vue b/fda-ui/pages/container/_container_id/database/_database_id/table/index.vue index c726689973..04026449a9 100644 --- a/fda-ui/pages/container/_container_id/database/_database_id/table/index.vue +++ b/fda-ui/pages/container/_container_id/database/_database_id/table/index.vue @@ -21,8 +21,8 @@ export default { return { db: null, items: [ - { text: 'Databases', href: '/container' }, - { text: `${this.$route.params.database_id}`, href: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/table` } + { text: 'Databases', to: '/container', activeClass: '' }, + { text: `${this.$route.params.database_id}`, to: `/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/table`, activeClass: '' } ] } }, diff --git a/fda-ui/pages/container/index.vue b/fda-ui/pages/container/index.vue index 39aa3876e4..14e494cdbd 100644 --- a/fda-ui/pages/container/index.vue +++ b/fda-ui/pages/container/index.vue @@ -67,7 +67,7 @@ export default { createDbDialog: false, databases: [], items: [ - { text: 'Databases', href: '/container' } + { text: 'Databases', to: '/container', activeClass: '' } ], loading: true, error: false, -- GitLab