diff options
Diffstat (limited to 'src/views')
22 files changed, 40 insertions, 89 deletions
diff --git a/src/views/ChangePassword/ChangePassword.vue b/src/views/ChangePassword/ChangePassword.vue index 7778ebee1..18d9dcca5 100644 --- a/src/views/ChangePassword/ChangePassword.vue +++ b/src/views/ChangePassword/ChangePassword.vue @@ -108,7 +108,7 @@ export default { password: { required }, passwordConfirm: { required, - sameAsPassword: sameAs('password'), + sameAsPassword: sameAs(this.form.password), }, }, }; @@ -136,11 +136,6 @@ export default { </script> <style lang="scss" scoped> -@import '@/assets/styles/bmc/helpers/_index.scss'; -@import '@/assets/styles/bootstrap/_helpers.scss'; - -@import '@/assets/styles/bootstrap/_helpers.scss'; - .change-password__form-container { @include media-breakpoint-up('md') { max-width: 360px; diff --git a/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue b/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue index 848322c05..4ee4eba16 100644 --- a/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue +++ b/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue @@ -139,20 +139,6 @@ {{ dataFormatter(item.graphicalConsoleEnabled) }} </dd> </dl> - <!-- Serial console --> - <p class="mt-1 mb-2 h6 float-none m-0"> - {{ $t('pageInventory.table.serialConsole') }} - </p> - <dl class="ml-4"> - <dt>{{ $t('pageInventory.table.connectTypesSupported') }}:</dt> - <dd> - {{ dataFormatterArray(item.serialConsoleConnectTypes) }} - </dd> - <dt>{{ $t('pageInventory.table.maxConcurrentSessions') }}:</dt> - <dd>{{ dataFormatter(item.serialConsoleMaxSessions) }}</dd> - <dt>{{ $t('pageInventory.table.serviceEnabled') }}:</dt> - <dd>{{ dataFormatter(item.serialConsoleEnabled) }}</dd> - </dl> </b-col> </b-row> </b-container> diff --git a/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue index 2839c788a..23beb47a2 100644 --- a/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue +++ b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue @@ -123,6 +123,16 @@ <dt>{{ $t('pageInventory.table.coreCount') }}:</dt> <dd>{{ dataFormatter(item.processorSummaryCoreCount) }}</dd> </dl> + <!-- Serial console --> + <p class="mt-1 mb-2 h6 float-none m-0"> + {{ $t('pageInventory.table.serialConsole') }} + </p> + <dl class="ml-4"> + <dt>{{ $t('pageInventory.table.maxConcurrentSessions') }}:</dt> + <dd>{{ dataFormatter(item.serialConsoleMaxSessions) }}</dd> + <dt>{{ $t('pageInventory.table.serviceEnabled') }}:</dt> + <dd>{{ dataFormatter(item.serialConsoleEnabled) }}</dd> + </dl> </b-col> </b-row> </b-container> diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index 6106c50d4..5212f92f0 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -102,6 +102,10 @@ export default { text: 'English', }, { + value: 'ka-GE', + text: 'ქართული', + }, + { value: 'ru-RU', text: 'Русский', }, diff --git a/src/views/Logs/Dumps/Dumps.vue b/src/views/Logs/Dumps/Dumps.vue index 044691187..4783f8234 100644 --- a/src/views/Logs/Dumps/Dumps.vue +++ b/src/views/Logs/Dumps/Dumps.vue @@ -172,6 +172,7 @@ import SearchFilterMixin, { import TableFilter from '@/components/Global/TableFilter'; import TableFilterMixin from '@/components/Mixins/TableFilterMixin'; import i18n from '@/i18n'; +import { useI18n } from 'vue-i18n'; export default { components: { @@ -203,6 +204,7 @@ export default { }, data() { return { + $t: useI18n().t, isBusy: true, fields: [ { diff --git a/src/views/Logs/Dumps/DumpsForm.vue b/src/views/Logs/Dumps/DumpsForm.vue index 7da3084f9..17257d1ec 100644 --- a/src/views/Logs/Dumps/DumpsForm.vue +++ b/src/views/Logs/Dumps/DumpsForm.vue @@ -40,6 +40,7 @@ import Alert from '@/components/Global/Alert'; import BVToastMixin from '@/components/Mixins/BVToastMixin'; import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js'; import i18n from '@/i18n'; +import { useI18n } from 'vue-i18n'; export default { components: { Alert, ModalConfirmation }, @@ -51,10 +52,14 @@ export default { }, data() { return { + $t: useI18n().t, selectedDumpType: null, dumpTypeOptions: [ - { value: 'bmc', text: i18n.global.t('pageDumps.form.bmcDump') }, - { value: 'system', text: i18n.global.t('pageDumps.form.systemDump') }, + { value: 'bmc', text: i18n.global.t('pageDumps.dumpTypes.bmcDump') }, + { + value: 'system', + text: i18n.global.t('pageDumps.dumpTypes.systemDump'), + }, ], }; }, diff --git a/src/views/Logs/Dumps/DumpsModalConfirmation.vue b/src/views/Logs/Dumps/DumpsModalConfirmation.vue index 4b68681bb..05b868dba 100644 --- a/src/views/Logs/Dumps/DumpsModalConfirmation.vue +++ b/src/views/Logs/Dumps/DumpsModalConfirmation.vue @@ -41,6 +41,7 @@ import StatusIcon from '@/components/Global/StatusIcon'; import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js'; import { useVuelidate } from '@vuelidate/core'; +import { useI18n } from 'vue-i18n'; export default { components: { StatusIcon }, @@ -52,6 +53,7 @@ export default { }, data() { return { + $t: useI18n().t, confirmed: false, }; }, diff --git a/src/views/Operations/Firmware/Firmware.vue b/src/views/Operations/Firmware/Firmware.vue index db1a4c7e1..76124061a 100644 --- a/src/views/Operations/Firmware/Firmware.vue +++ b/src/views/Operations/Firmware/Firmware.vue @@ -15,8 +15,8 @@ :is-server-off="isServerOff" /> - <!-- Host Firmware --> - <host-cards v-if="!isSingleFileUploadEnabled" /> + <!-- Bios Firmware --> + <bios-cards v-if="!isSingleFileUploadEnabled" /> </b-col> </b-row> @@ -41,7 +41,7 @@ import AlertsServerPower from './FirmwareAlertServerPower'; import BmcCards from './FirmwareCardsBmc'; import FormUpdate from './FirmwareFormUpdate'; -import HostCards from './FirmwareCardsHost'; +import BiosCards from './FirmwareCardsBios'; import PageSection from '@/components/Global/PageSection'; import PageTitle from '@/components/Global/PageTitle'; @@ -54,7 +54,7 @@ export default { AlertsServerPower, BmcCards, FormUpdate, - HostCards, + BiosCards, PageSection, PageTitle, }, diff --git a/src/views/Operations/Firmware/FirmwareCardsHost.vue b/src/views/Operations/Firmware/FirmwareCardsBios.vue index 852e9fb12..a2994cc57 100644 --- a/src/views/Operations/Firmware/FirmwareCardsHost.vue +++ b/src/views/Operations/Firmware/FirmwareCardsBios.vue @@ -1,5 +1,5 @@ <template> - <page-section :section-title="$t('pageFirmware.sectionTitleHostCards')"> + <page-section :section-title="$t('pageFirmware.sectionTitleBiosCards')"> <b-card-group deck> <!-- Running image --> <b-card> @@ -49,10 +49,10 @@ export default { }, computed: { running() { - return this.$store.getters['firmware/activeHostFirmware']; + return this.$store.getters['firmware/activeBiosFirmware']; }, backup() { - return this.$store.getters['firmware/backupHostFirmware']; + return this.$store.getters['firmware/backupBiosFirmware']; }, runningVersion() { return this.running?.version || '--'; @@ -73,11 +73,6 @@ export default { </script> <style lang="scss" scoped> -@import '@/assets/styles/bmc/helpers/_index.scss'; -@import '@/assets/styles/bootstrap/_helpers.scss'; - -@import '@/assets/styles/bootstrap/_helpers.scss'; - .page-section { margin-top: -$spacer * 1.5; } diff --git a/src/views/Operations/Kvm/KvmConsole.vue b/src/views/Operations/Kvm/KvmConsole.vue index 2b3084c5e..64ee8977d 100644 --- a/src/views/Operations/Kvm/KvmConsole.vue +++ b/src/views/Operations/Kvm/KvmConsole.vue @@ -176,14 +176,7 @@ export default { }; </script> -<style lang="scss"> -@import '@/assets/styles/bmc/custom/_kvm.scss'; -</style> - -<style lang="scss" scoped> -@import '@/assets/styles/bmc/helpers/_index.scss'; -@import '@/assets/styles/bootstrap/_helpers.scss'; - +<style scoped lang="scss"> .button-ctrl-alt-delete { float: right; } diff --git a/src/views/Operations/RebootBmc/RebootBmc.vue b/src/views/Operations/RebootBmc/RebootBmc.vue index 0865d77db..d8c529c8a 100644 --- a/src/views/Operations/RebootBmc/RebootBmc.vue +++ b/src/views/Operations/RebootBmc/RebootBmc.vue @@ -88,7 +88,4 @@ export default { }; </script> -<style lang="scss" scoped> -@import '@/assets/styles/bmc/helpers/_index.scss'; -@import '@/assets/styles/bootstrap/_helpers.scss'; -</style> +<style lang="scss" scoped></style> diff --git a/src/views/Operations/SerialOverLan/SerialOverLanConsole.vue b/src/views/Operations/SerialOverLan/SerialOverLanConsole.vue index b711422f9..8f1c4bc6d 100644 --- a/src/views/Operations/SerialOverLan/SerialOverLanConsole.vue +++ b/src/views/Operations/SerialOverLan/SerialOverLanConsole.vue @@ -163,9 +163,6 @@ export default { </script> <style lang="scss" scoped> -@import '@/assets/styles/bmc/helpers/_index.scss'; -@import '@/assets/styles/bootstrap/_helpers.scss'; - @import '~xterm/css/xterm.css'; #terminal { diff --git a/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue b/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue index 9c36f2431..491dc7f92 100644 --- a/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue +++ b/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue @@ -55,12 +55,7 @@ </b-col> </b-row> <b-row> - <b-col - v-if="hasBootSourceOptions && oneTimeBootEnabled" - sm="8" - md="6" - xl="4" - > + <b-col v-if="hasBootSourceOptions" sm="8" md="6" xl="4"> <page-section :section-title="$t('pageServerPowerOperations.serverBootSettings')" > diff --git a/src/views/Overview/OverviewCard.vue b/src/views/Overview/OverviewCard.vue index 342bf98cf..7cfe55811 100644 --- a/src/views/Overview/OverviewCard.vue +++ b/src/views/Overview/OverviewCard.vue @@ -77,9 +77,6 @@ export default { </script> <style lang="scss" scoped> -@import '@/assets/styles/bmc/helpers/_index.scss'; -@import '@/assets/styles/bootstrap/_helpers.scss'; - a { vertical-align: middle; font-size: 14px; diff --git a/src/views/Overview/OverviewEvents.vue b/src/views/Overview/OverviewEvents.vue index 0056af4a5..147f30cc4 100644 --- a/src/views/Overview/OverviewEvents.vue +++ b/src/views/Overview/OverviewEvents.vue @@ -91,9 +91,6 @@ export default { </script> <style lang="scss" scoped> -@import '@/assets/styles/bmc/helpers/_index.scss'; -@import '@/assets/styles/bootstrap/_helpers.scss'; - .status-icon { vertical-align: text-top; } diff --git a/src/views/Overview/OverviewQuickLinks.vue b/src/views/Overview/OverviewQuickLinks.vue index 506de112a..abcf9fa97 100644 --- a/src/views/Overview/OverviewQuickLinks.vue +++ b/src/views/Overview/OverviewQuickLinks.vue @@ -6,7 +6,7 @@ <dt>{{ $t('pageOverview.bmcTime') }}</dt> <dd v-if="bmcTime" data-test-id="overviewQuickLinks-text-bmcTime"> {{ $filters.formatDate(bmcTime) }} - {{ $filters.formatDate(bmcTime) }} + {{ $filters.formatTime(bmcTime) }} </dd> <dd v-else>--</dd> </dl> @@ -56,9 +56,6 @@ export default { </script> <style lang="scss" scoped> -@import '@/assets/styles/bmc/helpers/_index.scss'; -@import '@/assets/styles/bootstrap/_helpers.scss'; - dd, dl { margin: 0; diff --git a/src/views/ProfileSettings/ProfileSettings.vue b/src/views/ProfileSettings/ProfileSettings.vue index 561816e00..73ee63f0f 100644 --- a/src/views/ProfileSettings/ProfileSettings.vue +++ b/src/views/ProfileSettings/ProfileSettings.vue @@ -207,7 +207,7 @@ export default { maxLength: maxLength(this.passwordRequirements.maxLength), }, confirmPassword: { - sameAsPassword: sameAs('newPassword'), + sameAsPassword: sameAs(this.form.newPassword), }, }, }; diff --git a/src/views/SecurityAndAccess/Policies/Policies.vue b/src/views/SecurityAndAccess/Policies/Policies.vue index 6cba88320..58d83638c 100644 --- a/src/views/SecurityAndAccess/Policies/Policies.vue +++ b/src/views/SecurityAndAccess/Policies/Policies.vue @@ -257,9 +257,6 @@ export default { </script> <style lang="scss" scoped> -@import '@/assets/styles/bmc/helpers/_index.scss'; -@import '@/assets/styles/bootstrap/_helpers.scss'; - .setting-section { border-bottom: 1px solid gray('300'); } diff --git a/src/views/SecurityAndAccess/UserManagement/ModalSettings.vue b/src/views/SecurityAndAccess/UserManagement/ModalSettings.vue index c5086f3de..e853af350 100644 --- a/src/views/SecurityAndAccess/UserManagement/ModalSettings.vue +++ b/src/views/SecurityAndAccess/UserManagement/ModalSettings.vue @@ -193,7 +193,7 @@ export default { } if (this.v$.form.unlockMethod.$dirty) { lockoutDuration = this.form.unlockMethod - ? this.form.lockoutDuration + ? parseInt(this.form.lockoutDuration) : 0; } diff --git a/src/views/SecurityAndAccess/UserManagement/TableRoles.vue b/src/views/SecurityAndAccess/UserManagement/TableRoles.vue index 5d9285697..7e9faefb0 100644 --- a/src/views/SecurityAndAccess/UserManagement/TableRoles.vue +++ b/src/views/SecurityAndAccess/UserManagement/TableRoles.vue @@ -15,11 +15,6 @@ <checkmark20 /> </template> </template> - <template #cell(noaccess)="data"> - <template v-if="data.value"> - <checkmark20 /> - </template> - </template> </b-table> </template> @@ -41,7 +36,6 @@ export default { administrator: true, operator: true, readonly: false, - noaccess: false, }, { description: i18n.global.t( @@ -50,7 +44,6 @@ export default { administrator: true, operator: false, readonly: false, - noaccess: false, }, { description: i18n.global.t( @@ -59,7 +52,6 @@ export default { administrator: true, operator: true, readonly: true, - noaccess: false, }, { description: i18n.global.t( @@ -68,7 +60,6 @@ export default { administrator: true, operator: false, readonly: false, - noaccess: false, }, { description: i18n.global.t( @@ -77,7 +68,6 @@ export default { administrator: true, operator: true, readonly: true, - noaccess: false, }, ], fields: [ @@ -100,11 +90,6 @@ export default { label: i18n.global.t('pageUserManagement.tableRoles.readOnly'), class: 'text-center', }, - { - key: 'noaccess', - label: i18n.global.t('pageUserManagement.tableRoles.noAccess'), - class: 'text-center', - }, ], }; }, diff --git a/src/views/SecurityAndAccess/UserManagement/UserManagement.vue b/src/views/SecurityAndAccess/UserManagement/UserManagement.vue index cfe04a6f9..cb057a7cd 100644 --- a/src/views/SecurityAndAccess/UserManagement/UserManagement.vue +++ b/src/views/SecurityAndAccess/UserManagement/UserManagement.vue @@ -425,9 +425,6 @@ export default { </script> <style lang="scss" scoped> -@import '@/assets/styles/bmc/helpers/_index.scss'; -@import '@/assets/styles/bootstrap/_helpers.scss'; - .btn.collapsed { svg { transform: rotate(180deg); diff --git a/src/views/Settings/DateTime/DateTime.vue b/src/views/Settings/DateTime/DateTime.vue index 4475a55e2..b723530b2 100644 --- a/src/views/Settings/DateTime/DateTime.vue +++ b/src/views/Settings/DateTime/DateTime.vue @@ -213,7 +213,7 @@ import { requiredIf } from '@vuelidate/validators'; import { helpers } from 'vuelidate/lib/validators'; import { useI18n } from 'vue-i18n'; -const isoDateRegex = /([12]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01]))/; +const isoDateRegex = /([12]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])$)/; const isoTimeRegex = /^(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$/; export default { |