Merge branch 'staging_environment' into 3d_bin
This commit is contained in:
commit
ff64f8594c
27 changed files with 219 additions and 42 deletions
|
|
@ -271,7 +271,7 @@ export default function Bin(props: Props) {
|
|||
resp.data.devices.forEach((dev: any) => {
|
||||
let device = Device.create(dev);
|
||||
if (attachedDevIds.includes(device.id())) {
|
||||
devs.push(Device.create(dev));
|
||||
devs.push(device);
|
||||
}
|
||||
});
|
||||
setDevices(devs);
|
||||
|
|
@ -676,6 +676,8 @@ export default function Bin(props: Props) {
|
|||
userID={user.id()}
|
||||
components={components}
|
||||
setComponents={setComponents}
|
||||
componentDevices={componentDevices}
|
||||
setComponentDevices={setComponentDevices}
|
||||
updateBinStatus={updateStatus}
|
||||
/>
|
||||
</Grid>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue