Skip to content

Commit c1804d0

Browse files
committed
clean up StudentWork's "loading" knowledge
1 parent 9d79bae commit c1804d0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

source/views/sis/student-work/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,20 @@ export default class StudentWorkView extends React.PureComponent {
4343

4444
state: {
4545
jobs: Array<{title: string, data: Array<JobType>}>,
46-
loaded: boolean,
46+
loading: boolean,
4747
refreshing: boolean,
4848
error: boolean,
4949
} = {
5050
jobs: [],
51-
loaded: false,
51+
loading: true,
5252
refreshing: false,
5353
error: false,
5454
}
5555

5656
componentWillMount() {
57-
this.fetchData()
57+
this.fetchData().then(() => {
58+
this.setState(() => ({loading: false}))
59+
})
5860
}
5961

6062
fetchData = async () => {
@@ -87,8 +89,6 @@ export default class StudentWorkView extends React.PureComponent {
8789
this.setState(() => ({error: true}))
8890
console.error(err)
8991
}
90-
91-
this.setState(() => ({loaded: true}))
9292
}
9393

9494
refresh = async () => {
@@ -124,7 +124,7 @@ export default class StudentWorkView extends React.PureComponent {
124124
return <Text selectable={true}>{this.state.error}</Text>
125125
}
126126

127-
if (!this.state.loaded) {
127+
if (this.state.loading) {
128128
return <LoadingView />
129129
}
130130

0 commit comments

Comments
 (0)