diff options
5 files changed, 16 insertions, 5 deletions
diff --git a/src/env/components/FirmwareSingleImage/FirmwareSingleImage.vue b/src/env/components/FirmwareSingleImage/FirmwareSingleImage.vue index 92c4e800..426d5c25 100644 --- a/src/env/components/FirmwareSingleImage/FirmwareSingleImage.vue +++ b/src/env/components/FirmwareSingleImage/FirmwareSingleImage.vue @@ -216,7 +216,7 @@ import ModalUpload from './FirmwareSingleImageModalUpload'; import ModalRebootBackup from './FirmwareSingleImageModalRebootBackup'; import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js'; -import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin'; +import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin'; import BVToastMixin from '@/components/Mixins/BVToastMixin'; export default { @@ -241,6 +241,7 @@ export default { tftpIpAddress: null, tftpFileName: null, timeoutId: null, + loading, }; }, computed: { diff --git a/src/views/AccessControl/Ldap/Ldap.vue b/src/views/AccessControl/Ldap/Ldap.vue index 9e32adaf..25e50cbf 100644 --- a/src/views/AccessControl/Ldap/Ldap.vue +++ b/src/views/AccessControl/Ldap/Ldap.vue @@ -236,7 +236,7 @@ import { requiredIf } from 'vuelidate/lib/validators'; import BVToastMixin from '@/components/Mixins/BVToastMixin'; import VuelidateMixin from '@/components/Mixins/VuelidateMixin'; -import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin'; +import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin'; import InputPasswordToggle from '@/components/Global/InputPasswordToggle'; import PageTitle from '@/components/Global/PageTitle'; import PageSection from '@/components/Global/PageSection'; @@ -271,6 +271,7 @@ export default { baseDn: '', userIdAttribute: '', groupIdAttribute: '', + loading, }, }; }, diff --git a/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue b/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue index d3c19d57..6e8c9671 100644 --- a/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue +++ b/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue @@ -210,7 +210,9 @@ import PageSection from '@/components/Global/PageSection'; import BVToastMixin from '@/components/Mixins/BVToastMixin'; import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin'; -import LocalTimezoneLabelMixin from '@/components/Mixins/LocalTimezoneLabelMixin'; +import LocalTimezoneLabelMixin, { + loading, +} from '@/components/Mixins/LocalTimezoneLabelMixin'; import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js'; import { mapState } from 'vuex'; @@ -243,6 +245,7 @@ export default { }, ntp: { firstAddress: '', secondAddress: '', thirdAddress: '' }, }, + loading, }; }, validations() { diff --git a/src/views/Configuration/NetworkSettings/NetworkSettings.vue b/src/views/Configuration/NetworkSettings/NetworkSettings.vue index 3260dffb..4cf0f83d 100644 --- a/src/views/Configuration/NetworkSettings/NetworkSettings.vue +++ b/src/views/Configuration/NetworkSettings/NetworkSettings.vue @@ -299,7 +299,7 @@ import IconTrashcan from '@carbon/icons-vue/es/trash-can/20'; import IconAdd from '@carbon/icons-vue/es/add--alt/20'; import BVToastMixin from '@/components/Mixins/BVToastMixin'; -import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin'; +import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin'; import PageSection from '@/components/Global/PageSection'; import PageTitle from '@/components/Global/PageTitle'; import TableRowAction from '@/components/Global/TableRowAction'; @@ -365,6 +365,7 @@ export default { ipv4StaticTableItems: [], dnsStaticTableItems: [], }, + loading, }; }, validations() { diff --git a/src/views/Control/ManagePowerUsage/ManagePowerUsage.vue b/src/views/Control/ManagePowerUsage/ManagePowerUsage.vue index 5fcf938b..38dbf0b8 100644 --- a/src/views/Control/ManagePowerUsage/ManagePowerUsage.vue +++ b/src/views/Control/ManagePowerUsage/ManagePowerUsage.vue @@ -87,7 +87,7 @@ <script> import PageTitle from '@/components/Global/PageTitle'; -import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin'; +import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin'; import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js'; import BVToastMixin from '@/components/Mixins/BVToastMixin'; import { requiredIf, between } from 'vuelidate/lib/validators'; @@ -101,6 +101,11 @@ export default { this.hideLoader(); next(); }, + data() { + return { + loading, + }; + }, computed: { ...mapGetters({ powerConsumptionValue: 'powerControl/powerConsumptionValue', |