From f4036af90e601b9e942fe4efef76d5ab4905d4a3 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 18 Jul 2024 13:15:30 +0200 Subject: [PATCH] Cleanup and fixes --- .../src/components/admin/alarms/AlarmList.vue | 6 +- .../login/PasswordRecoveryChangeForm.vue | 141 ------------------ .../components/login/PasswordRecoveryForm.vue | 130 ---------------- .../login/PasswordRecoverySmsTotpForm.vue | 140 ----------------- frontend/src/components/login/TwofaForm.vue | 78 ---------- frontend/src/router/index.js | 22 --- frontend/src/views/account/SettingsView.vue | 6 + frontend/src/views/admin/ParametersView.vue | 6 + .../login/PasswordRecoveryChangeView.vue | 26 ---- .../src/views/login/PasswordRecoveryForm.vue | 129 ---------------- .../login/PasswordRecoverySmsTotpView.vue | 26 ---- .../src/views/login/PasswordRecoveryView.vue | 26 ---- frontend/src/views/login/TwoFA.vue | 26 ---- 13 files changed, 15 insertions(+), 747 deletions(-) delete mode 100644 frontend/src/components/login/PasswordRecoveryChangeForm.vue delete mode 100644 frontend/src/components/login/PasswordRecoveryForm.vue delete mode 100644 frontend/src/components/login/PasswordRecoverySmsTotpForm.vue delete mode 100644 frontend/src/components/login/TwofaForm.vue delete mode 100644 frontend/src/views/login/PasswordRecoveryChangeView.vue delete mode 100644 frontend/src/views/login/PasswordRecoveryForm.vue delete mode 100644 frontend/src/views/login/PasswordRecoverySmsTotpView.vue delete mode 100644 frontend/src/views/login/PasswordRecoveryView.vue delete mode 100644 frontend/src/views/login/TwoFA.vue diff --git a/frontend/src/components/admin/alarms/AlarmList.vue b/frontend/src/components/admin/alarms/AlarmList.vue index ae90785c4..6c022dec0 100644 --- a/frontend/src/components/admin/alarms/AlarmList.vue +++ b/frontend/src/components/admin/alarms/AlarmList.vue @@ -151,9 +151,9 @@ function fetchAlarms({ page, itemsPerPage, sortBy }) { page: page || 1, page_size: itemsPerPage || 10, } - if (sortBy) { + if (sortBy && sortBy.length) { params.ordering = sortBy - .map((item) => (this.options.sortDesc[0] ? `-${item}` : item)) + .map((item) => (item.order !== 'asc' ? `-${item.key}` : item.key)) .join(',') } if (search.value !== '') { @@ -177,7 +177,7 @@ async function deleteAlarm(alarm, single = true) { } async function deleteAlarms() { await alarmsApi.bulkDelete(selected.value.map((alarm) => alarm.id)) - busStore.displayNotification({ msg: this.$gettext('Alarms deleted') }) + busStore.displayNotification({ msg: $gettext('Alarms deleted') }) selected.value = [] fetchAlarms({}) } diff --git a/frontend/src/components/login/PasswordRecoveryChangeForm.vue b/frontend/src/components/login/PasswordRecoveryChangeForm.vue deleted file mode 100644 index 9d071c342..000000000 --- a/frontend/src/components/login/PasswordRecoveryChangeForm.vue +++ /dev/null @@ -1,141 +0,0 @@ - - - - - diff --git a/frontend/src/components/login/PasswordRecoveryForm.vue b/frontend/src/components/login/PasswordRecoveryForm.vue deleted file mode 100644 index 8cdbdcddc..000000000 --- a/frontend/src/components/login/PasswordRecoveryForm.vue +++ /dev/null @@ -1,130 +0,0 @@ - - - diff --git a/frontend/src/components/login/PasswordRecoverySmsTotpForm.vue b/frontend/src/components/login/PasswordRecoverySmsTotpForm.vue deleted file mode 100644 index e771816ea..000000000 --- a/frontend/src/components/login/PasswordRecoverySmsTotpForm.vue +++ /dev/null @@ -1,140 +0,0 @@ - - - diff --git a/frontend/src/components/login/TwofaForm.vue b/frontend/src/components/login/TwofaForm.vue deleted file mode 100644 index 020f658fb..000000000 --- a/frontend/src/components/login/TwofaForm.vue +++ /dev/null @@ -1,78 +0,0 @@ - - - diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index 5420cd0d6..c5bb5076d 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -12,33 +12,11 @@ const routes = [ name: 'Login', component: () => import('@/views/login/LoginView.vue'), }, - { - path: 'twofa', - name: 'TwoFA', - component: () => import('@/views/login/TwoFA.vue'), - }, { path: 'logged', name: 'LoginCallback', component: () => import('@/views/login/LoginCallbackView.vue'), }, - { - path: 'password_recovery', - name: 'PasswordRecovery', - component: () => import('../views/login/PasswordRecoveryView.vue'), - }, - { - path: 'password_recovery/confirm/:id?/:token?/', - name: 'PasswordRecoveryChangeForm', - component: () => - import('../views/login/PasswordRecoveryChangeView.vue'), - }, - { - path: 'password_recovery/sms_confirm', - name: 'PasswordRecoverySms', - component: () => - import('../views/login/PasswordRecoverySmsTotpView.vue'), - }, ], }, { diff --git a/frontend/src/views/account/SettingsView.vue b/frontend/src/views/account/SettingsView.vue index 4669c0e35..1c2047581 100644 --- a/frontend/src/views/account/SettingsView.vue +++ b/frontend/src/views/account/SettingsView.vue @@ -65,3 +65,9 @@ const tab = ref() background-color: #f7f8fa !important; } + + diff --git a/frontend/src/views/admin/ParametersView.vue b/frontend/src/views/admin/ParametersView.vue index 8fce86ec7..c47e49f2f 100644 --- a/frontend/src/views/admin/ParametersView.vue +++ b/frontend/src/views/admin/ParametersView.vue @@ -195,3 +195,9 @@ loadParams(route.params.app) color: #ff5252 !important; } + + diff --git a/frontend/src/views/login/PasswordRecoveryChangeView.vue b/frontend/src/views/login/PasswordRecoveryChangeView.vue deleted file mode 100644 index 1aa56e03f..000000000 --- a/frontend/src/views/login/PasswordRecoveryChangeView.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - diff --git a/frontend/src/views/login/PasswordRecoveryForm.vue b/frontend/src/views/login/PasswordRecoveryForm.vue deleted file mode 100644 index b405d81f3..000000000 --- a/frontend/src/views/login/PasswordRecoveryForm.vue +++ /dev/null @@ -1,129 +0,0 @@ - - - diff --git a/frontend/src/views/login/PasswordRecoverySmsTotpView.vue b/frontend/src/views/login/PasswordRecoverySmsTotpView.vue deleted file mode 100644 index 88cef341a..000000000 --- a/frontend/src/views/login/PasswordRecoverySmsTotpView.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - diff --git a/frontend/src/views/login/PasswordRecoveryView.vue b/frontend/src/views/login/PasswordRecoveryView.vue deleted file mode 100644 index ccf11a50b..000000000 --- a/frontend/src/views/login/PasswordRecoveryView.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - diff --git a/frontend/src/views/login/TwoFA.vue b/frontend/src/views/login/TwoFA.vue deleted file mode 100644 index 462146614..000000000 --- a/frontend/src/views/login/TwoFA.vue +++ /dev/null @@ -1,26 +0,0 @@ - - -