Skip to content

Commit 7483ce9

Browse files
committed
UI - reduce 1 second load
fix images loading after backdrop
1 parent 1219bcd commit 7483ce9

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

src/client/src/pages/DataView360/View/View360.js

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,12 @@ class View360 extends Component {
5252
}
5353

5454
async componentDidMount() {
55-
this.setState({
55+
await this.setState({
5656
isDataBusy: true,
5757
showSearchBar: false,
5858
matchId: _.last(this.props.location.pathname.split('/'))
5959
});
6060

61-
await new Promise(resolve => setTimeout(resolve, 1000));
6261
let response = await fetch(`/api/360/${this.state.matchId}`,
6362
{
6463
method: 'GET',
@@ -77,14 +76,14 @@ class View360 extends Component {
7776
let fosterEvents = {};
7877

7978
for (let id of animalIds) {
80-
this.getAnimalEvents(id, this.state.matchId).then((events) => {
81-
adoptionEvents[id] = _.filter(events[id], function(e) {
82-
return e["Type"] && e["Type"].toLowerCase().includes("adopt");
83-
});
84-
fosterEvents[id] = _.filter(events[id], function(e) {
85-
return e["Type"] && e["Type"].toLowerCase().includes("foster");
86-
});
87-
})
79+
let events = await this.getAnimalEvents(id, this.state.matchId);
80+
81+
adoptionEvents[id] = _.filter(events[id], function(e) {
82+
return e["Type"] && e["Type"].toLowerCase().includes("adopt");
83+
});
84+
fosterEvents[id] = _.filter(events[id], function(e) {
85+
return e["Type"] && e["Type"].toLowerCase().includes("foster");
86+
});
8887
}
8988

9089
this.setState({

0 commit comments

Comments
 (0)