diff --git a/src/fireedge/src/client/components/Tabs/Common/Permissions.js b/src/fireedge/src/client/components/Tabs/Common/Permissions.js index 61c5a9c2a0..b044ef426d 100644 --- a/src/fireedge/src/client/components/Tabs/Common/Permissions.js +++ b/src/fireedge/src/client/components/Tabs/Common/Permissions.js @@ -69,7 +69,7 @@ const Permissions = React.memo(({ const newPermission = { [name]: Helper.stringToBoolean(value) ? '0' : '1' } const response = await changePermissions(id, newPermission) - String(response?.data) === String(id) && + String(response) === String(id) && setPermissions(prev => ({ ...prev, ...newPermission })) } diff --git a/src/fireedge/src/client/components/Tabs/Vm/Network/index.js b/src/fireedge/src/client/components/Tabs/Vm/Network/index.js index 866feebf34..18cfe2c1d4 100644 --- a/src/fireedge/src/client/components/Tabs/Vm/Network/index.js +++ b/src/fireedge/src/client/components/Tabs/Vm/Network/index.js @@ -22,23 +22,22 @@ import NetworkList from 'client/components/Tabs/Vm/Network/List' import * as VirtualMachine from 'client/models/VirtualMachine' import * as Helper from 'client/models/Helper' -const VmNetworkTab = ({ tabProps, ...data }) => { +const VmNetworkTab = ({ tabProps, ...vm }) => { const { actions = [] } = tabProps - const nics = VirtualMachine.getNics(data, { groupAlias: true }) - const hypervisor = VirtualMachine.getHypervisor(data) + const nics = VirtualMachine.getNics(vm, { groupAlias: true }) + const hypervisor = VirtualMachine.getHypervisor(vm) const actionsAvailable = Helper.getActionsAvailable(actions, hypervisor) return ( - + ) } VmNetworkTab.propTypes = { tabProps: PropTypes.shape({ actions: PropTypes.object - }), - actions: PropTypes.array + }) } VmNetworkTab.displayName = 'VmNetworkTab' diff --git a/src/fireedge/src/client/features/Auth/actionsView.js b/src/fireedge/src/client/features/Auth/actionsView.js index 8f0c5687d6..79bbf9e6bd 100644 --- a/src/fireedge/src/client/features/Auth/actionsView.js +++ b/src/fireedge/src/client/features/Auth/actionsView.js @@ -27,10 +27,9 @@ export const getSunstoneViews = createAsyncThunk( async (_, { dispatch }) => { try { const views = await authService.getSunstoneViews() ?? {} - const config = await authService.getSunstoneConfig() ?? {} + // const config = await authService.getSunstoneConfig() ?? {} return { - config, views, view: Object.keys(views)[0] } diff --git a/src/fireedge/src/client/utils/request.js b/src/fireedge/src/client/utils/request.js index b1a850374e..d73340f8f0 100644 --- a/src/fireedge/src/client/utils/request.js +++ b/src/fireedge/src/client/utils/request.js @@ -53,8 +53,8 @@ export const requestConfig = (data, command) => { /* Spread 'from' values in current params */ const mappedParams = Object.entries(params)?.reduce( - (acc, [paraName, { from }]) => ({ - ...acc, + (params, [paraName, { from }]) => ({ + ...params, [paraName]: { from, value: data[paraName] } }), {}