Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into dev_environment
This commit is contained in:
commit
2c859d9de9
3 changed files with 36 additions and 10 deletions
|
|
@ -219,7 +219,7 @@ export default function DeviceComponent() {
|
|||
true
|
||||
);
|
||||
let userPromise = userAPI.getUser(user.settings.id, deviceScope(deviceID.toString()));
|
||||
let prefPromise = deviceAPI.listDeviceComponentPreferences(deviceID);
|
||||
let prefPromise = deviceAPI.listDeviceComponentPreferences(deviceID, getContextKeys().slice(0, -1), getContextTypes().slice(0, -1));
|
||||
Promise.all([componentsPromise, userPromise, prefPromise])
|
||||
.then((responses: any) => {
|
||||
const rawComponents: Array<any> = or(responses[0].data.components, []).sort(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue