summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Fullbright <kennyneedsmilky@gmail.com>2021-12-28 01:19:37 +0300
committerDixsie Wolmers <dixsiew@gmail.com>2022-02-04 17:28:46 +0300
commit410578537f7ca6dd76aa406b440b0a435606c448 (patch)
tree6a2530310fc5cbfdd70905af6a49e8bf176a4a16
parentb86f4152ba832ba92a2607c30037d5f818058120 (diff)
downloadwebui-vue-410578537f7ca6dd76aa406b440b0a435606c448.tar.xz
Set table busy state on load
- Add busy prop to tables Signed-off-by: Kenneth Fullbright <kennyneedsmilky@gmail.com> Change-Id: I4416f12967c9a0ad6c8bb782c7d8de5c17fdd195
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue3
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue3
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableChassis.vue3
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue3
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableFans.vue3
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue3
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue3
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableSystem.vue3
-rw-r--r--src/views/HardwareStatus/Sensors/Sensors.vue9
-rw-r--r--src/views/Logs/Dumps/Dumps.vue11
-rw-r--r--src/views/Logs/EventLogs/EventLogs.vue9
-rw-r--r--src/views/Logs/PostCodeLogs/PostCodeLogs.vue9
-rw-r--r--src/views/SecurityAndAccess/Certificates/Certificates.vue9
-rw-r--r--src/views/SecurityAndAccess/Ldap/TableRoleGroups.vue6
-rw-r--r--src/views/SecurityAndAccess/Sessions/Sessions.vue9
-rw-r--r--src/views/SecurityAndAccess/UserManagement/UserManagement.vue9
16 files changed, 73 insertions, 22 deletions
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue b/src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue
index afc14704..b4010bfe 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue
@@ -9,6 +9,7 @@
:fields="fields"
show-empty
:empty-text="$t('global.table.emptyMessage')"
+ :busy="isBusy"
>
<!-- Expand chevron icon -->
<template #cell(expandRow)="row">
@@ -81,6 +82,7 @@ export default {
mixins: [BVToastMixin, TableRowExpandMixin, DataFormatterMixin],
data() {
return {
+ isBusy: true,
fields: [
{
key: 'expandRow',
@@ -130,6 +132,7 @@ export default {
this.$store.dispatch('assemblies/getAssemblyInfo').finally(() => {
// Emit initial data fetch complete to parent component
this.$root.$emit('hardware-status-assembly-complete');
+ this.isBusy = false;
});
},
methods: {
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue b/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue
index ad73f59e..48b914f4 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue
@@ -7,6 +7,7 @@
:fields="fields"
show-empty
:empty-text="$t('global.table.emptyMessage')"
+ :busy="isBusy"
>
<!-- Expand chevron icon -->
<template #cell(expandRow)="row">
@@ -175,6 +176,7 @@ export default {
mixins: [BVToastMixin, TableRowExpandMixin, DataFormatterMixin],
data() {
return {
+ isBusy: true,
fields: [
{
key: 'expandRow',
@@ -221,6 +223,7 @@ export default {
this.$store.dispatch('bmc/getBmcInfo').finally(() => {
// Emit initial data fetch complete to parent component
this.$root.$emit('hardware-status-bmc-manager-complete');
+ this.isBusy = false;
});
},
methods: {
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue b/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue
index 3f63c06c..b49cec7f 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue
@@ -7,6 +7,7 @@
:fields="fields"
show-empty
:empty-text="$t('global.table.emptyMessage')"
+ :busy="isBusy"
>
<!-- Expand chevron icon -->
<template #cell(expandRow)="row">
@@ -128,6 +129,7 @@ export default {
mixins: [BVToastMixin, TableRowExpandMixin, DataFormatterMixin],
data() {
return {
+ isBusy: true,
fields: [
{
key: 'expandRow',
@@ -168,6 +170,7 @@ export default {
this.$store.dispatch('chassis/getChassisInfo').finally(() => {
// Emit initial data fetch complete to parent component
this.$root.$emit('hardware-status-chassis-complete');
+ this.isBusy = false;
});
},
methods: {
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue b/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
index 73be06bc..65994810 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
@@ -28,6 +28,7 @@
:filter="searchFilter"
:empty-text="$t('global.table.emptyMessage')"
:empty-filtered-text="$t('global.table.emptySearchMessage')"
+ :busy="isBusy"
@filtered="onFiltered"
>
<!-- Expand chevron icon -->
@@ -181,6 +182,7 @@ export default {
],
data() {
return {
+ isBusy: true,
fields: [
{
key: 'expandRow',
@@ -228,6 +230,7 @@ export default {
this.$store.dispatch('memory/getDimms').finally(() => {
// Emit initial data fetch complete to parent component
this.$root.$emit('hardware-status-dimm-slot-complete');
+ this.isBusy = false;
});
},
methods: {
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableFans.vue b/src/views/HardwareStatus/Inventory/InventoryTableFans.vue
index ff568043..fe788c53 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableFans.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableFans.vue
@@ -28,6 +28,7 @@
:filter="searchFilter"
:empty-text="$t('global.table.emptyMessage')"
:empty-filtered-text="$t('global.table.emptySearchMessage')"
+ :busy="isBusy"
@filtered="onFiltered"
>
<!-- Expand chevron icon -->
@@ -120,6 +121,7 @@ export default {
],
data() {
return {
+ isBusy: true,
fields: [
{
key: 'expandRow',
@@ -171,6 +173,7 @@ export default {
this.$store.dispatch('fan/getFanInfo').finally(() => {
// Emit initial data fetch complete to parent component
this.$root.$emit('hardware-status-fans-complete');
+ this.isBusy = false;
});
},
methods: {
diff --git a/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue b/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
index ba0896bf..aed7871a 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
@@ -28,6 +28,7 @@
:filter="searchFilter"
:empty-text="$t('global.table.emptyMessage')"
:empty-filtered-text="$t('global.table.emptySearchMessage')"
+ :busy="isBusy"
@filtered="onFiltered"
>
<!-- Expand chevron icon -->
@@ -138,6 +139,7 @@ export default {
],
data() {
return {
+ isBusy: true,
fields: [
{
key: 'expandRow',
@@ -189,6 +191,7 @@ export default {
this.$store.dispatch('powerSupply/getAllPowerSupplies').finally(() => {
// Emit initial data fetch complete to parent component
this.$root.$emit('hardware-status-power-supplies-complete');
+ this.isBusy = false;
});
},
methods: {
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue b/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue
index fbe58374..7d5dd700 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue
@@ -27,6 +27,7 @@
:filter="searchFilter"
:empty-text="$t('global.table.emptyMessage')"
:empty-filtered-text="$t('global.table.emptySearchMessage')"
+ :busy="isBusy"
@filtered="onFiltered"
>
<!-- Expand button -->
@@ -172,6 +173,7 @@ export default {
],
data() {
return {
+ isBusy: true,
fields: [
{
key: 'expandRow',
@@ -224,6 +226,7 @@ export default {
this.$store.dispatch('processors/getProcessorsInfo').finally(() => {
// Emit initial data fetch complete to parent component
this.$root.$emit('hardware-status-processors-complete');
+ this.isBusy = false;
});
},
methods: {
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
index 93e65bbe..cf2cf020 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
@@ -7,6 +7,7 @@
:items="systems"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
+ :busy="isBusy"
>
<!-- Expand chevron icon -->
<template #cell(expandRow)="row">
@@ -162,6 +163,7 @@ export default {
mixins: [BVToastMixin, TableRowExpandMixin, DataFormatterMixin],
data() {
return {
+ isBusy: true,
fields: [
{
key: 'expandRow',
@@ -208,6 +210,7 @@ export default {
this.$store.dispatch('system/getSystem').finally(() => {
// Emit initial data fetch complete to parent component
this.$root.$emit('hardware-status-system-complete');
+ this.isBusy = false;
});
},
methods: {
diff --git a/src/views/HardwareStatus/Sensors/Sensors.vue b/src/views/HardwareStatus/Sensors/Sensors.vue
index 15cecfff..6329d9d8 100644
--- a/src/views/HardwareStatus/Sensors/Sensors.vue
+++ b/src/views/HardwareStatus/Sensors/Sensors.vue
@@ -53,6 +53,7 @@
:filter="searchFilter"
:empty-text="$t('global.table.emptyMessage')"
:empty-filtered-text="$t('global.table.emptySearchMessage')"
+ :busy="isBusy"
@filtered="onFiltered"
@row-selected="onRowSelected($event, filteredSensors.length)"
>
@@ -146,6 +147,7 @@ export default {
},
data() {
return {
+ isBusy: true,
fields: [
{
key: 'checkbox',
@@ -220,9 +222,10 @@ export default {
},
created() {
this.startLoader();
- this.$store
- .dispatch('sensors/getAllSensors')
- .finally(() => this.endLoader());
+ this.$store.dispatch('sensors/getAllSensors').finally(() => {
+ this.endLoader();
+ this.isBusy = false;
+ });
},
methods: {
sortCompare(a, b, key) {
diff --git a/src/views/Logs/Dumps/Dumps.vue b/src/views/Logs/Dumps/Dumps.vue
index 179a503e..81c9de04 100644
--- a/src/views/Logs/Dumps/Dumps.vue
+++ b/src/views/Logs/Dumps/Dumps.vue
@@ -59,8 +59,9 @@
:empty-text="$t('global.table.emptyMessage')"
:empty-filtered-text="$t('global.table.emptySearchMessage')"
:filter="searchFilter"
- @filtered="onFiltered"
- @row-selected="onRowSelected($event, filteredDumps.length)"
+ :busy="isBusy"
+ @filtered="onChangeSearchFilter"
+ @row-selected="onRowSelected($event, filteredTableItems.length)"
>
<!-- Checkbox column -->
<template #head(checkbox)>
@@ -201,6 +202,7 @@ export default {
},
data() {
return {
+ isBusy: true,
fields: [
{
key: 'checkbox',
@@ -304,7 +306,10 @@ export default {
},
created() {
this.startLoader();
- this.$store.dispatch('dumps/getAllDumps').finally(() => this.endLoader());
+ this.$store.dispatch('dumps/getBmcDumpEntries').finally(() => {
+ this.endLoader();
+ this.isBusy = false;
+ });
},
methods: {
convertBytesToMegabytes(bytes) {
diff --git a/src/views/Logs/EventLogs/EventLogs.vue b/src/views/Logs/EventLogs/EventLogs.vue
index fb5458f2..94872117 100644
--- a/src/views/Logs/EventLogs/EventLogs.vue
+++ b/src/views/Logs/EventLogs/EventLogs.vue
@@ -82,6 +82,7 @@
:per-page="perPage"
:current-page="currentPage"
:filter="searchFilter"
+ :busy="isBusy"
@filtered="onFiltered"
@row-selected="onRowSelected($event, filteredLogs.length)"
>
@@ -314,6 +315,7 @@ export default {
},
data() {
return {
+ isBusy: true,
fields: [
{
key: 'expandRow',
@@ -434,9 +436,10 @@ export default {
},
created() {
this.startLoader();
- this.$store
- .dispatch('eventLog/getEventLogData')
- .finally(() => this.endLoader());
+ this.$store.dispatch('eventLog/getEventLogData').finally(() => {
+ this.endLoader();
+ this.isBusy = false;
+ });
},
methods: {
changelogStatus(row) {
diff --git a/src/views/Logs/PostCodeLogs/PostCodeLogs.vue b/src/views/Logs/PostCodeLogs/PostCodeLogs.vue
index 6ef575e5..d116d2ed 100644
--- a/src/views/Logs/PostCodeLogs/PostCodeLogs.vue
+++ b/src/views/Logs/PostCodeLogs/PostCodeLogs.vue
@@ -64,6 +64,7 @@
:per-page="perPage"
:current-page="currentPage"
:filter="searchFilter"
+ :busy="isBusy"
@filtered="onFiltered"
@row-selected="onRowSelected($event, filteredLogs.length)"
>
@@ -208,6 +209,7 @@ export default {
},
data() {
return {
+ isBusy: true,
fields: [
{
key: 'checkbox',
@@ -297,9 +299,10 @@ export default {
},
created() {
this.startLoader();
- this.$store
- .dispatch('postCodeLogs/getPostCodesLogData')
- .finally(() => this.endLoader());
+ this.$store.dispatch('postCodeLogs/getPostCodesLogData').finally(() => {
+ this.endLoader();
+ this.isBusy = false;
+ });
},
methods: {
exportAllLogsString() {
diff --git a/src/views/SecurityAndAccess/Certificates/Certificates.vue b/src/views/SecurityAndAccess/Certificates/Certificates.vue
index 9d208897..0113b80a 100644
--- a/src/views/SecurityAndAccess/Certificates/Certificates.vue
+++ b/src/views/SecurityAndAccess/Certificates/Certificates.vue
@@ -57,6 +57,7 @@
responsive="md"
show-empty
hover
+ :busy="isBusy"
:fields="fields"
:items="tableItems"
:empty-text="$t('global.table.emptyMessage')"
@@ -133,6 +134,7 @@ export default {
},
data() {
return {
+ isBusy: true,
modalCertificate: null,
fields: [
{
@@ -214,9 +216,10 @@ export default {
async created() {
this.startLoader();
await this.$store.dispatch('global/getBmcTime');
- this.$store
- .dispatch('certificates/getCertificates')
- .finally(() => this.endLoader());
+ this.$store.dispatch('certificates/getCertificates').finally(() => {
+ this.endLoader();
+ this.isBusy = false;
+ });
},
methods: {
onTableRowAction(event, rowItem) {
diff --git a/src/views/SecurityAndAccess/Ldap/TableRoleGroups.vue b/src/views/SecurityAndAccess/Ldap/TableRoleGroups.vue
index 6e231110..5ae3e3d1 100644
--- a/src/views/SecurityAndAccess/Ldap/TableRoleGroups.vue
+++ b/src/views/SecurityAndAccess/Ldap/TableRoleGroups.vue
@@ -37,6 +37,7 @@
hover
no-sort-reset
sort-icon-left
+ :busy="isBusy"
:items="tableItems"
:fields="fields"
:empty-text="$t('global.table.emptyMessage')"
@@ -121,6 +122,7 @@ export default {
mixins: [BVTableSelectableMixin, BVToastMixin, LoadingBarMixin],
data() {
return {
+ isBusy: true,
activeRoleGroup: null,
fields: [
{
@@ -179,7 +181,9 @@ export default {
},
},
created() {
- this.$store.dispatch('userManagement/getAccountRoles');
+ this.$store.dispatch('userManagement/getAccountRoles').finally(() => {
+ this.isBusy = false;
+ });
},
methods: {
onBatchAction() {
diff --git a/src/views/SecurityAndAccess/Sessions/Sessions.vue b/src/views/SecurityAndAccess/Sessions/Sessions.vue
index 9782e7f2..07ee725d 100644
--- a/src/views/SecurityAndAccess/Sessions/Sessions.vue
+++ b/src/views/SecurityAndAccess/Sessions/Sessions.vue
@@ -36,6 +36,7 @@
hover
show-empty
sort-by="clientID"
+ :busy="isBusy"
:fields="fields"
:items="allConnections"
:filter="searchFilter"
@@ -158,6 +159,7 @@ export default {
},
data() {
return {
+ isBusy: true,
fields: [
{
key: 'checkbox',
@@ -217,9 +219,10 @@ export default {
},
created() {
this.startLoader();
- this.$store
- .dispatch('sessions/getSessionsData')
- .finally(() => this.endLoader());
+ this.$store.dispatch('sessions/getSessionsData').finally(() => {
+ this.endLoader();
+ this.isBusy = false;
+ });
},
methods: {
onFiltered(filteredItems) {
diff --git a/src/views/SecurityAndAccess/UserManagement/UserManagement.vue b/src/views/SecurityAndAccess/UserManagement/UserManagement.vue
index 015fee91..c6c556c8 100644
--- a/src/views/SecurityAndAccess/UserManagement/UserManagement.vue
+++ b/src/views/SecurityAndAccess/UserManagement/UserManagement.vue
@@ -33,6 +33,7 @@
show-empty
no-select-on-click
hover
+ :busy="isBusy"
:fields="fields"
:items="tableItems"
:empty-text="$t('global.table.emptyMessage')"
@@ -155,6 +156,7 @@ export default {
},
data() {
return {
+ isBusy: true,
activeUser: null,
fields: [
{
@@ -237,9 +239,10 @@ export default {
},
created() {
this.startLoader();
- this.$store
- .dispatch('userManagement/getUsers')
- .finally(() => this.endLoader());
+ this.$store.dispatch('userManagement/getUsers').finally(() => {
+ this.endLoader();
+ this.isBusy = false;
+ });
this.$store.dispatch('userManagement/getAccountSettings');
this.$store.dispatch('userManagement/getAccountRoles');
},