Migrate to Bootstrap 5 and remove Vue compat plugin
Complete migration from Bootstrap 4 (bootstrap-vue) to Bootstrap 5
(bootstrap-vue-next) and remove the @vue/compat plugin to finalize
the Vue 3 migration.
Bundle size impact:
- Before (Bootstrap 4 + bootstrap-vue): 535 KiB gzipped
- After (Bootstrap 5 + bootstrap-vue-next): 511 KiB gzipped
- Reduction: 24 KiB (4.5% smaller)
Package updates:
- Update bootstrap 4.6.2 -> 5.3.8
- Update bootstrap-vue 2.23.1 -> bootstrap-vue-next 0.40.8
- Remove @vue/compat plugin
- Update vue 3.4.29 -> 3.5.24 and related packages
- Add mitt 3.0.1 for global event bus
- Add vue-demi 0.14.10 for library compatibility
Bootstrap 5 CSS updates:
- Replace directional classes: ml/mr/pl/pr -> ms/me/ps/pe
- Replace text-left/right -> text-start/end
- Replace sr-only -> visually-hidden / visually-hidden-focusable
- Update media breakpoint xs -> sm (Bootstrap 5 removed xs)
- Update color functions: gray("700") -> $gray-700
- Add form-switch border-radius for curved toggles
- Update alert, table, toast, form, and button styles
Bootstrap-Vue-Next API changes:
- Use createBootstrap() for plugin registration
- Update modal footer slots: #modal-footer -> #footer
- Fix form select events: @change -> @update:model-value
- Add v-model bindings to modals instead of manual show()/hide()
- Update toast system with custom plugin wrapping useToast()
- Register components and directives explicitly
Vue 3 specific updates:
- Replace $root.$emit with mitt event bus (eventBus.js)
- Update render function from h(App) to createApp(App)
- Add emits option to components
- Use h() instead of $createElement in mixins
- Add Vue 3 compile-time feature flags with documentation
- Update event listeners: $on/$off to eventBus methods
- Add beforeUnmount cleanup for event listeners
New components and significant additions:
- src/plugins/toast.js - Custom toast plugin wrapping useToast() for
Options API compatibility
- src/components/Global/ConfirmModal.vue - Global confirmation dialog
shim to replace Bootstrap 4's removed bvModal.msgBoxConfirm
- src/eventBus.js - mitt-based event bus with Vue 2-compatible API
- Navigation state preservation on page refresh implemented
Critical fixes:
- Add global API interceptor to strip Vue reactivity from payloads
- Preserve binary data (File, Blob, FormData) in API requests
- Fix Generate CSR modal v-model binding for proper open/close
- Remove debug logging and fix jest configuration
- Fix responsive text visibility in AppHeader
- Update BVTableSelectableMixin for proper row selection
- Fix BVToastMixin VNode rendering for Vue 3
Vue 3 modal fixes (lazy-loaded components):
- Add v-model support to network modals (ModalIpv4, ModalIpv6, ModalDns,
ModalHostname, ModalMacAddress, ModalDefaultGateway) by adding
modelValue prop, watcher on modelValue that triggers show(), and
update:modelValue emit in resetForm
- Remove lazy loading from TableIpv4, TableIpv6, TableDns to ensure
modal component refs are available when v-model triggers
- Fix modal title accessibility by adding title prop to modals
(ModalAddDestination, ModalUser, ModalAddRoleGroup, etc.)
i18n fixes (computed properties):
- Fix computed properties using i18n translations in ModalAddRoleGroup,
ModalUser, and ModalUploadCertificate
- Move useI18n() call from data() to setup() and return i18n object
- Use i18n.t() instead of $t in computed properties and templates
- Prevents "this.$t is not a function" and "_ctx.$t is not a function"
errors in Vue 3
Toast notification fixes:
- Fix toast progress bar visibility by setting progressProps to
undefined (documented way to opt-out) instead of false
- Change modelValue prop to interval for auto-dismiss timing
- Remove temporary CSS display:none hack from _toasts.scss
Network settings fixes:
- Fix checkbox @change event sending Vue reactive proxy object instead
of boolean by casting with !! operator in changeDomainNameState and
related methods in NetworkGlobalSettings.vue
- Ensures API receives plain boolean values in PATCH requests
Navigation fixes:
- Fix nav-link styling for navigation items without children by
replacing b-nav-item with router-link in AppNavigation.vue
- Prevents blue font color from .nav-link CSS class
Configuration updates:
- Remove vue-compat webpack configuration
- Add Vue 3 feature flags (__VUE_OPTIONS_API__, etc.)
- Add .cursor to .gitignore
Accessibility improvements:
- Add autocomplete attributes to password and credential inputs
- Add modal title props for screen reader support
Build completes successfully and UI behavior matches pre-migration.
Extracted features (to be submitted in follow-up PRs):
The following features were removed from this migration PR to keep it
focused on the Bootstrap 5 upgrade. They will be submitted separately:
1. UnresponsiveModal - Server connectivity watchdog with auto-retry
2. Auth token persistence - sessionStorage support for X-Auth-Token
3. Hardware store error handling - try/catch, dynamic discovery
4. Login page connecting indicator - Backend polling with spinner
5. Test updates - Jest setup and snapshot updates for
Bootstrap-Vue-Next
6. Documentation updates - Vue 3 and Vue I18n v9+ API documentation
7. Enhanced ConfirmModal - Feature-rich confirmation dialog with
custom actions
Change-Id: Ib76a58f324b3c926cf536e6e4626e4271639de38
Signed-off-by: Jason Westover <jwestover@nvidia.com>
diff --git a/src/views/SecurityAndAccess/Ldap/Ldap.vue b/src/views/SecurityAndAccess/Ldap/Ldap.vue
index 6de491a..a39b800 100644
--- a/src/views/SecurityAndAccess/Ldap/Ldap.vue
+++ b/src/views/SecurityAndAccess/Ldap/Ldap.vue
@@ -24,7 +24,7 @@
<b-form-group
class="m-0"
:label="$t('pageLdap.ariaLabel.ldapSettings')"
- label-class="sr-only"
+ label-class="visually-hidden-focusable"
:disabled="!form.ldapAuthenticationEnabled || loading"
>
<b-row>
@@ -50,12 +50,16 @@
</b-form-checkbox>
</b-form-group>
<dl>
- <dt>{{ $t('pageLdap.form.caCertificateValidUntil') }}</dt>
+ <dt>
+ {{ $t('pageLdap.form.caCertificateValidUntil') }}
+ </dt>
<dd v-if="caCertificateExpiration">
{{ $filters.formatDate(caCertificateExpiration) }}
</dd>
<dd v-else>--</dd>
- <dt>{{ $t('pageLdap.form.ldapCertificateValidUntil') }}</dt>
+ <dt>
+ {{ $t('pageLdap.form.ldapCertificateValidUntil') }}
+ </dt>
<dd v-if="ldapCertificateExpiration">
{{ $filters.formatDate(ldapCertificateExpiration) }}
</dd>
@@ -122,6 +126,7 @@
<b-form-input
id="bind-dn"
v-model="form.bindDn"
+ autocomplete="username"
data-test-id="ldap-input-bindDn"
:state="getValidationState(v$.form.bindDn)"
@change="v$.form.bindDn.$touch()"
@@ -143,6 +148,7 @@
id="bind-password"
v-model="form.bindPassword"
type="password"
+ autocomplete="current-password"
:state="getValidationState(v$.form.bindPassword)"
class="form-control-with-button"
@change="v$.form.bindPassword.$touch()"
@@ -173,7 +179,8 @@
<b-col sm="6" xl="4">
<b-form-group label-for="user-id-attribute">
<template #label>
- {{ $t('pageLdap.form.userIdAttribute') }} -
+ {{ $t('pageLdap.form.userIdAttribute') }}
+ -
<span class="form-text d-inline">
{{ $t('global.form.optional') }}
</span>
@@ -189,7 +196,8 @@
<b-col sm="6" xl="4">
<b-form-group label-for="group-id-attribute">
<template #label>
- {{ $t('pageLdap.form.groupIdAttribute') }} -
+ {{ $t('pageLdap.form.groupIdAttribute') }}
+ -
<span class="form-text d-inline">
{{ $t('global.form.optional') }}
</span>
diff --git a/src/views/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue b/src/views/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
index f4dcb82..38ff473 100644
--- a/src/views/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
+++ b/src/views/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
@@ -1,13 +1,11 @@
<template>
- <b-modal id="modal-role-group" ref="modal" @ok="onOk" @hidden="resetForm">
- <template #modal-title>
- <template v-if="roleGroup">
- {{ $t('pageLdap.modal.editRoleGroup') }}
- </template>
- <template v-else>
- {{ $t('pageLdap.modal.addNewRoleGroup') }}
- </template>
- </template>
+ <b-modal
+ id="modal-role-group"
+ ref="modal"
+ :title="modalTitle"
+ @ok="onOk"
+ @hidden="resetForm"
+ >
<b-container>
<b-row>
<b-col sm="8">
@@ -15,7 +13,7 @@
<!-- Edit role group -->
<template v-if="roleGroup !== null">
<dl class="mb-4">
- <dt>{{ $t('pageLdap.modal.groupName') }}</dt>
+ <dt>{{ i18n.t('pageLdap.modal.groupName') }}</dt>
<dd style="word-break: break-all">{{ form.groupName }}</dd>
</dl>
</template>
@@ -23,7 +21,7 @@
<!-- Add new role group -->
<template v-else>
<b-form-group
- :label="$t('pageLdap.modal.groupName')"
+ :label="i18n.t('pageLdap.modal.groupName')"
label-for="role-group-name"
>
<b-form-input
@@ -33,13 +31,13 @@
@input="v$.form.groupName.$touch()"
/>
<b-form-invalid-feedback role="alert">
- {{ $t('global.form.fieldRequired') }}
+ {{ i18n.t('global.form.fieldRequired') }}
</b-form-invalid-feedback>
</b-form-group>
</template>
<b-form-group
- :label="$t('pageLdap.modal.groupPrivilege')"
+ :label="i18n.t('pageLdap.modal.groupPrivilege')"
label-for="privilege"
>
<b-form-select
@@ -51,28 +49,28 @@
>
<template v-if="!roleGroup" #first>
<b-form-select-option :value="null" disabled>
- {{ $t('global.form.selectAnOption') }}
+ {{ i18n.t('global.form.selectAnOption') }}
</b-form-select-option>
</template>
</b-form-select>
<b-form-invalid-feedback role="alert">
- {{ $t('global.form.fieldRequired') }}
+ {{ i18n.t('global.form.fieldRequired') }}
</b-form-invalid-feedback>
</b-form-group>
</b-form>
</b-col>
</b-row>
</b-container>
- <template #modal-footer="{ cancel }">
+ <template #footer="{ cancel }">
<b-button variant="secondary" @click="cancel()">
- {{ $t('global.action.cancel') }}
+ {{ i18n.t('global.action.cancel') }}
</b-button>
<b-button form="role-group" type="submit" variant="primary" @click="onOk">
<template v-if="roleGroup">
- {{ $t('global.action.save') }}
+ {{ i18n.t('global.action.save') }}
</template>
<template v-else>
- {{ $t('global.action.add') }}
+ {{ i18n.t('global.action.add') }}
</template>
</b-button>
</template>
@@ -102,13 +100,14 @@
},
emits: ['ok', 'hidden'],
setup() {
+ const i18n = useI18n();
return {
v$: useVuelidate(),
+ i18n,
};
},
data() {
return {
- $t: useI18n().t,
form: {
groupName: null,
groupPrivilege: null,
@@ -116,6 +115,11 @@
};
},
computed: {
+ modalTitle() {
+ return this.roleGroup
+ ? this.i18n.t('pageLdap.modal.editRoleGroup')
+ : this.i18n.t('pageLdap.modal.addNewRoleGroup');
+ },
accountRoles() {
return this.$store.getters['userManagement/accountRoles'];
},
diff --git a/src/views/SecurityAndAccess/Ldap/TableRoleGroups.vue b/src/views/SecurityAndAccess/Ldap/TableRoleGroups.vue
index f73d927..8b8b3ac 100644
--- a/src/views/SecurityAndAccess/Ldap/TableRoleGroups.vue
+++ b/src/views/SecurityAndAccess/Ldap/TableRoleGroups.vue
@@ -8,7 +8,7 @@
</b-col>
</b-row>
<b-row>
- <b-col class="text-right" md="9">
+ <b-col class="text-end" md="9">
<b-btn
variant="primary"
:disabled="!isServiceEnabled"
@@ -23,7 +23,9 @@
<b-col md="9">
<table-toolbar
ref="toolbar"
- :selected-items-count="selectedRows.length"
+ :selected-items-count="
+ Array.isArray(selectedRows) ? selectedRows.length : 0
+ "
:actions="batchActions"
@clear-selected="clearSelectedRows($refs.table)"
@batch-action="onBatchAction"
@@ -35,8 +37,9 @@
show-empty
no-select-on-click
hover
- no-sort-reset
+ must-sort
sort-icon-left
+ thead-class="table-light"
:busy="isBusy"
:items="tableItems"
:fields="fields"
@@ -49,9 +52,11 @@
v-model="tableHeaderCheckboxModel"
:indeterminate="tableHeaderCheckboxIndeterminate"
:disabled="!isServiceEnabled"
- @change="onChangeHeaderCheckbox($refs.table)"
+ @change="onChangeHeaderCheckbox($refs.table, $event)"
>
- <span class="sr-only">{{ $t('global.table.selectAll') }}</span>
+ <span class="visually-hidden-focusable">
+ {{ $t('global.table.selectAll') }}
+ </span>
</b-form-checkbox>
</template>
<template #cell(checkbox)="row">
@@ -60,7 +65,9 @@
:disabled="!isServiceEnabled"
@change="toggleSelectRow($refs.table, row.index)"
>
- <span class="sr-only">{{ $t('global.table.selectItem') }}</span>
+ <span class="visually-hidden-focusable">
+ {{ $t('global.table.selectItem') }}
+ </span>
</b-form-checkbox>
</template>
@@ -84,6 +91,7 @@
</b-col>
</b-row>
<modal-add-role-group
+ v-model="showRoleGroupModal"
:role-group="activeRoleGroup"
@ok="saveRoleGroup"
@hidden="activeRoleGroup = null"
@@ -110,6 +118,7 @@
import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
import { useI18n } from 'vue-i18n';
import i18n from '@/i18n';
+import { useModal } from 'bootstrap-vue-next';
export default {
components: {
@@ -122,11 +131,16 @@
TableToolbar,
},
mixins: [BVTableSelectableMixin, BVToastMixin, LoadingBarMixin],
+ setup() {
+ const bvModal = useModal();
+ return { bvModal };
+ },
data() {
return {
$t: useI18n().t,
isBusy: true,
activeRoleGroup: null,
+ showRoleGroupModal: false,
fields: [
{
key: 'checkbox',
@@ -146,7 +160,7 @@
key: 'actions',
sortable: false,
label: '',
- tdClass: 'text-right',
+ tdClass: 'text-end',
},
],
batchActions: [
@@ -190,31 +204,30 @@
},
methods: {
onBatchAction() {
- this.$bvModal
- .msgBoxConfirm(
- i18n.global.t(
- 'pageLdap.modal.deleteRoleGroupBatchConfirmMessage',
- this.selectedRows.length,
- ),
- {
- title: i18n.global.t('pageLdap.modal.deleteRoleGroup'),
- okTitle: i18n.global.t('global.action.delete'),
- cancelTitle: i18n.global.t('global.action.cancel'),
- autoFocusButton: 'ok',
- },
- )
- .then((deleteConfirmed) => {
- if (deleteConfirmed) {
- this.startLoader();
- this.$store
- .dispatch('ldap/deleteRoleGroup', {
- roleGroups: this.selectedRows,
- })
- .then((success) => this.successToast(success))
- .catch(({ message }) => this.errorToast(message))
- .finally(() => this.endLoader());
- }
- });
+ const count = this.selectedRows.length;
+ this.confirmDialog(
+ i18n.global.t(
+ 'pageLdap.modal.deleteRoleGroupBatchConfirmMessage',
+ count,
+ ),
+ {
+ title: i18n.global.t('pageLdap.modal.deleteRoleGroup'),
+ okTitle: i18n.global.t('global.action.delete'),
+ cancelTitle: i18n.global.t('global.action.cancel'),
+ autoFocusButton: 'ok',
+ },
+ ).then((deleteConfirmed) => {
+ if (deleteConfirmed) {
+ this.startLoader();
+ this.$store
+ .dispatch('ldap/deleteRoleGroup', {
+ roleGroups: this.selectedRows,
+ })
+ .then((success) => this.successToast(success))
+ .catch(({ message }) => this.errorToast(message))
+ .finally(() => this.endLoader());
+ }
+ });
},
onTableRowAction(action, row) {
switch (action) {
@@ -222,34 +235,37 @@
this.initRoleGroupModal(row);
break;
case 'delete':
- this.$bvModal
- .msgBoxConfirm(
- i18n.global.t('pageLdap.modal.deleteRoleGroupConfirmMessage', {
- groupName: row.groupName,
- }),
- {
- title: i18n.global.t('pageLdap.modal.deleteRoleGroup'),
- okTitle: i18n.global.t('global.action.delete'),
- cancelTitle: i18n.global.t('global.action.cancel'),
- autoFocusButton: 'ok',
- },
- )
- .then((deleteConfirmed) => {
- if (deleteConfirmed) {
- this.startLoader();
- this.$store
- .dispatch('ldap/deleteRoleGroup', { roleGroups: [row] })
- .then((success) => this.successToast(success))
- .catch(({ message }) => this.errorToast(message))
- .finally(() => this.endLoader());
- }
- });
+ this.confirmDialog(
+ i18n.global.t('pageLdap.modal.deleteRoleGroupConfirmMessage', {
+ groupName: row.groupName,
+ }),
+ {
+ title: i18n.global.t('pageLdap.modal.deleteRoleGroup'),
+ okTitle: i18n.global.t('global.action.delete'),
+ cancelTitle: i18n.global.t('global.action.cancel'),
+ autoFocusButton: 'ok',
+ },
+ ).then((deleteConfirmed) => {
+ if (deleteConfirmed) {
+ this.startLoader();
+ this.$store
+ .dispatch('ldap/deleteRoleGroup', {
+ roleGroups: [row],
+ })
+ .then((success) => this.successToast(success))
+ .catch(({ message }) => this.errorToast(message))
+ .finally(() => this.endLoader());
+ }
+ });
break;
}
},
+ confirmDialog(message, options = {}) {
+ return this.$confirm({ message, ...options });
+ },
initRoleGroupModal(roleGroup) {
this.activeRoleGroup = roleGroup;
- this.$bvModal.show('modal-role-group');
+ this.showRoleGroupModal = true;
},
saveRoleGroup({ addNew, groupName, groupPrivilege }) {
this.activeRoleGroup = null;