updated as in the interactions api
This commit is contained in:
parent
e8e32e1886
commit
c617ebf868
12 changed files with 66 additions and 50 deletions
|
|
@ -68,7 +68,7 @@ interface Props {
|
|||
|
||||
export default function Device(props: Props) {
|
||||
const classes = useStyles();
|
||||
const [{ user }] = useGlobalState();
|
||||
const [{ user, as }] = useGlobalState();
|
||||
const { error } = useSnackbar();
|
||||
const deviceID = props.device.id();
|
||||
const deviceAPI = useDeviceAPI();
|
||||
|
|
@ -106,7 +106,7 @@ export default function Device(props: Props) {
|
|||
["device"],
|
||||
true
|
||||
);
|
||||
let interactionsPromise = interactionsAPI.listInteractionsByDevice(deviceID);
|
||||
let interactionsPromise = interactionsAPI.listInteractionsByDevice(deviceID, undefined, as);
|
||||
let groupPromise: Promise<any> = Promise.resolve(undefined);
|
||||
Promise.all([userPromise, componentsPromise, interactionsPromise, groupPromise])
|
||||
.then(([userRes, componentsRes, interactionsRes]) => {
|
||||
|
|
@ -165,7 +165,7 @@ export default function Device(props: Props) {
|
|||
// }
|
||||
// })
|
||||
// .catch(err => {});
|
||||
}, [componentAPI, props.device, deviceID, error, interactionsAPI, /*usageAPI*/, userAPI, user]);
|
||||
}, [componentAPI, props.device, deviceID, error, interactionsAPI, /*usageAPI*/, userAPI, user, as]);
|
||||
|
||||
useEffect(() => {
|
||||
load();
|
||||
|
|
@ -365,7 +365,7 @@ export default function Device(props: Props) {
|
|||
device={device}
|
||||
isPaused={isPaused()}
|
||||
components={getOrderedComponents()}
|
||||
//interactions={interactions}
|
||||
interactions={interactions}
|
||||
availablePositions={availablePositions}
|
||||
availableOffsets={availableOffsets}
|
||||
permissions={permissions}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue