Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/assets/styles/bmc/custom/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ div[role='group'] {
.form-check-input[disabled='disabled'],
.form-check-input:disabled {
background-color: $gray-200;
opacity: 1;
opacity: 0.5;
& + .form-check-label {
// Disabled label for checkbox, radio,
// switch bootstrap form components
Expand Down
4 changes: 2 additions & 2 deletions src/components/Composables/usePaginationComposable.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ export const itemsPerPageOptions = [
},
];
const usePaginationComposable = () => {
const getTotalRowCount = (count) => {
return perPage === 0 ? 0 : count;
const getTotalRowCount = (count, itemPerPage) => {
return itemPerPage === 0 ? 1 : count;
};

return {
Expand Down
9 changes: 9 additions & 0 deletions src/router/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import Firmware from '@/views/Operations/Firmware';
import Certificates from '@/views/SecurityAndAccess/Certificates';
import Inventory from '../views/HardwareStatus/Inventory/Inventory.vue';
import SystemParameters from '@/views/ResourceManagement/SystemParameters';
import HardwareDeconfiguration from '../views/Settings/HardwareDeconfiguration/HardwareDeconfiguration.vue';

const roles = {
administrator: 'Administrator',
Expand Down Expand Up @@ -175,6 +176,14 @@ export const routes = [
title: i18n.global.t('appPageTitle.powerRestorePolicy'),
},
},
{
path: '/settings/hardware-deconfiguration',
name: 'hardware-deconfiguration',
component: HardwareDeconfiguration,
meta: {
title: i18n.global.t('appPageTitle.deconfigurationHardware'),
},
},
{
path: '/resource-management/power',
name: 'power',
Expand Down
4 changes: 3 additions & 1 deletion src/store/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import SystemParametersStore from './modules/ResourceManagement/SystemParameters
import CertificatesStore from './modules/SecurityAndAccess/CertificatesStore';
import UserManagementStore from './modules/SecurityAndAccess/UserManagementStore';
import PcieTopologyStore from './modules/HardwareStatus/PcieTopologyStore.js';
import HardwareDeconfigurationStore from './modules/Settings/HardwareDeconfigurationStore';
// ... (export use other stores)
export {
EventLogStore,
Expand Down Expand Up @@ -60,5 +61,6 @@ export {
SystemParametersStore,
CertificatesStore,
UserManagementStore,
PcieTopologyStore
PcieTopologyStore,
HardwareDeconfigurationStore,
};
2 changes: 2 additions & 0 deletions src/store/modules/GlobalStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ export const GlobalStore = defineStore('global', {
currentUserGetter: (state) => state.currentUser,
isServiceUser: (state) =>
state.currentUser?.RoleId === 'OemIBMServiceAgent' || !state.currentUser,
isReadOnlyUserGetter: (state) =>
state.currentUser?.RoleId === 'ReadOnly' || !state.currentUser,
},
actions: {
async getBmcTime() {
Expand Down
Loading