diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/store/modules/HardwareStatus/SensorsStore.js | 39 | ||||
| -rw-r--r-- | src/views/SecurityAndAccess/UserManagement/TableRoles.vue | 15 |
2 files changed, 38 insertions, 16 deletions
diff --git a/src/store/modules/HardwareStatus/SensorsStore.js b/src/store/modules/HardwareStatus/SensorsStore.js index 5d1ac4243..bb26561b6 100644 --- a/src/store/modules/HardwareStatus/SensorsStore.js +++ b/src/store/modules/HardwareStatus/SensorsStore.js @@ -41,7 +41,19 @@ const SensorsStore = { async resetSensors({ commit }) { commit('setSensorsDefault'); }, - async getSensors({ commit }, id) { + async getSensors({ dispatch }, id) { + await api + .get('/redfish/v1/') + .then(({ data }) => { + if (data?.ProtocolFeaturesSupported?.ExpandQuery?.MaxLevels > 0) { + return dispatch('getSensorsUsingQueryParams', id); + } else { + return dispatch('getSensorsWithoutQueryParams', id); + } + }) + .catch((error) => console.log(error)); + }, + async getSensorsWithoutQueryParams({ commit }, id) { const sensors = await api .get(`${id}/Sensors`) .then((response) => response.data.Members) @@ -72,6 +84,31 @@ const SensorsStore = { commit('setSensors', sensorData); }); }, + async getSensorsUsingQueryParams({ commit }, id) { + await api + .get(`${id}/Sensors?$expand=.($levels=1)`) + .then((response) => { + let sensorData = []; + response.data.Members.map((sensor) => { + const oneSensordata = { + name: sensor.Name, + status: sensor.Status?.Health, + currentValue: sensor.Reading, + lowerCaution: sensor.Thresholds?.LowerCaution?.Reading, + upperCaution: sensor.Thresholds?.UpperCaution?.Reading, + lowerCritical: sensor.Thresholds?.LowerCritical?.Reading, + upperCritical: sensor.Thresholds?.UpperCritical?.Reading, + units: sensor.ReadingUnits, + }; + sensorData.push(oneSensordata); + commit('setSensors', sensorData); + }); + }) + .then(() => { + return; + }) + .catch((error) => console.log(error)); + }, async getThermalSensors({ commit }, id) { return await api .get(`${id}/Thermal`) diff --git a/src/views/SecurityAndAccess/UserManagement/TableRoles.vue b/src/views/SecurityAndAccess/UserManagement/TableRoles.vue index 5d9285697..7e9faefb0 100644 --- a/src/views/SecurityAndAccess/UserManagement/TableRoles.vue +++ b/src/views/SecurityAndAccess/UserManagement/TableRoles.vue @@ -15,11 +15,6 @@ <checkmark20 /> </template> </template> - <template #cell(noaccess)="data"> - <template v-if="data.value"> - <checkmark20 /> - </template> - </template> </b-table> </template> @@ -41,7 +36,6 @@ export default { administrator: true, operator: true, readonly: false, - noaccess: false, }, { description: i18n.global.t( @@ -50,7 +44,6 @@ export default { administrator: true, operator: false, readonly: false, - noaccess: false, }, { description: i18n.global.t( @@ -59,7 +52,6 @@ export default { administrator: true, operator: true, readonly: true, - noaccess: false, }, { description: i18n.global.t( @@ -68,7 +60,6 @@ export default { administrator: true, operator: false, readonly: false, - noaccess: false, }, { description: i18n.global.t( @@ -77,7 +68,6 @@ export default { administrator: true, operator: true, readonly: true, - noaccess: false, }, ], fields: [ @@ -100,11 +90,6 @@ export default { label: i18n.global.t('pageUserManagement.tableRoles.readOnly'), class: 'text-center', }, - { - key: 'noaccess', - label: i18n.global.t('pageUserManagement.tableRoles.noAccess'), - class: 'text-center', - }, ], }; }, |