MT#65163 Improve device page performance and handle missing preferences

* Fix device detail form not rendering on page 2+ by
  adding a watcher for reactive data updates
* Add loading spinner while device preferences are loading
* Remove unused loadDevicePreferencesList call from list page mount

Change-Id: Icc0318126303763d5eab3a39568817a2c41e88e8
(cherry picked from commit 554466657a)
(cherry picked from commit f830334c5d)
mr13.5.1
Debora Crescenzo 1 week ago committed by Crescenzo Debora
parent 52262c503e
commit e2d8087213

@ -42,9 +42,12 @@
v-if="selectedTab === 'preferences'" v-if="selectedTab === 'preferences'"
class="col-12 column" class="col-12 column"
> >
<div class="col-12 col-md-6 q-pa-lg">
<csc-list-spinner
v-if="!deviceSelected || !changes"
/>
<div <div
v-if="changes" v-else
class="col-12 col-md-6 q-pa-lg"
side side
top top
> >
@ -169,6 +172,7 @@
</q-item> </q-item>
</q-list> </q-list>
</div> </div>
</div>
<div class="col-12 col-md-6 q-pa-lg"> <div class="col-12 col-md-6 q-pa-lg">
<csc-list-spinner <csc-list-spinner
@ -374,12 +378,17 @@ export default {
$route: { $route: {
async handler (to) { async handler (to) {
this.id = to.params.id this.id = to.params.id
this.changes = null
this.collapseDevice()
await this.getData(this.id) await this.getData(this.id)
} }
}, },
deviceSelected () { deviceSelected () {
this.changes = this.getDeviceData() this.changes = this.getDeviceData()
}, },
devicePreferencesSelected () {
this.changes = this.getDeviceData()
},
deviceUpdateState (state) { deviceUpdateState (state) {
if (state === RequestState.succeeded) { if (state === RequestState.succeeded) {
showToast(this.getDeviceUpdateToastMessage) showToast(this.getDeviceUpdateToastMessage)
@ -416,7 +425,8 @@ export default {
methods: { methods: {
...mapMutations('pbxDevices', [ ...mapMutations('pbxDevices', [
'expandDevice', 'expandDevice',
'expandDevicePreferences' 'expandDevicePreferences',
'collapseDevice'
]), ]),
...mapActions('pbxDevices', [ ...mapActions('pbxDevices', [
'setDeviceKeys', 'setDeviceKeys',
@ -443,10 +453,15 @@ export default {
await this.loadDevice(deviceId) await this.loadDevice(deviceId)
} }
const deviceProfileId = this.deviceMapById[deviceId].profile_id const device = this.deviceMapById[deviceId]
if (!device) {
return
}
const deviceProfileId = device.profile_id
const deviceProfile = this.deviceProfileMap[deviceProfileId] const deviceProfile = this.deviceProfileMap[deviceProfileId]
if (deviceProfile.device_id) { if (deviceProfile && deviceProfile.device_id) {
await this.loadDeviceModel({ await this.loadDeviceModel({
type: 'all', type: 'all',
deviceId: deviceProfile.device_id deviceId: deviceProfile.device_id
@ -462,18 +477,20 @@ export default {
this.loadSubscribers() this.loadSubscribers()
}, },
getDeviceData () { getDeviceData () {
return (this.deviceSelected && this.devicePreferencesSelected) if (!this.deviceSelected) {
? { return null
}
return {
station_name: this.deviceSelected.station_name, station_name: this.deviceSelected.station_name,
identifier: this.deviceSelected.identifier, identifier: this.deviceSelected.identifier,
profile_id: this.deviceSelected.profile_id, profile_id: this.deviceSelected.profile_id,
admin_name: this.devicePreferencesSelected.admin_name ? this.devicePreferencesSelected.admin_name : undefined, admin_name: this.devicePreferencesSelected?.admin_name || undefined,
admin_pass: this.devicePreferencesSelected.admin_pass ? this.devicePreferencesSelected.admin_pass : undefined, admin_pass: this.devicePreferencesSelected?.admin_pass || undefined,
web_gui_dis: this.devicePreferencesSelected.web_gui_dis ? this.devicePreferencesSelected.web_gui_dis : false, web_gui_dis: this.devicePreferencesSelected?.web_gui_dis || false,
user_conf_priority: this.devicePreferencesSelected.user_conf_priority ? this.devicePreferencesSelected.user_conf_priority : false, user_conf_priority: this.devicePreferencesSelected?.user_conf_priority || false,
FW_upg_dis: this.devicePreferencesSelected.FW_upg_dis ? this.devicePreferencesSelected.FW_upg_dis : false FW_upg_dis: this.devicePreferencesSelected?.FW_upg_dis || false
} }
: null
}, },
resetStationName () { resetStationName () {
this.changes.station_name = this.deviceSelected?.station_name this.changes.station_name = this.deviceSelected?.station_name

@ -302,12 +302,13 @@ export default {
} }
}, },
async created () { async created () {
if (this.deviceProfileList.length === 0) {
await this.loadProfiles() await this.loadProfiles()
}
}, },
mounted () { mounted () {
this.$scrollTo(this.$parent.$el) this.$scrollTo(this.$parent.$el)
this.loadDeviceListFiltered() this.loadDeviceListFiltered(this.deviceListCurrentPage || 1)
this.loadDevicePreferencesList()
}, },
methods: { methods: {
...mapActions('pbx', [ ...mapActions('pbx', [
@ -323,7 +324,6 @@ export default {
]), ]),
...mapActions('pbxDevices', [ ...mapActions('pbxDevices', [
'loadDeviceList', 'loadDeviceList',
'loadDevicePreferencesList',
'createDevice', 'createDevice',
'removeDevice' 'removeDevice'
]), ]),

Loading…
Cancel
Save