File tree 2 files changed +8
-1
lines changed
src/dashboard/Data/Browser
2 files changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -898,6 +898,10 @@ class Browser extends DashboardView {
898
898
899
899
async fetchParseData ( source , filters ) {
900
900
const { useMasterKey, skip, limit } = this . state ;
901
+ this . setLoading ( true ) ;
902
+ this . setState ( {
903
+ data : null ,
904
+ } )
901
905
const query = await queryFromFilters ( source , filters ) ;
902
906
const sortDir = this . state . ordering [ 0 ] === '-' ? '-' : '+' ;
903
907
const field = this . state . ordering . substr ( sortDir === '-' ? 1 : 0 ) ;
@@ -927,6 +931,8 @@ class Browser extends DashboardView {
927
931
this . setState ( { isUnique, uniqueField } ) ;
928
932
929
933
const data = await promise ;
934
+
935
+ this . setLoading ( false ) ;
930
936
return data ;
931
937
}
932
938
@@ -2089,6 +2095,7 @@ class Browser extends DashboardView {
2089
2095
classwiseCloudFunctions = { this . state . classwiseCloudFunctions }
2090
2096
callCloudFunction = { this . fetchAggregationPanelData }
2091
2097
isLoadingCloudFunction = { this . state . isLoading }
2098
+ isLoading = { this . state . isLoading }
2092
2099
setLoading = { this . setLoading }
2093
2100
AggregationPanelData = { this . state . AggregationPanelData }
2094
2101
setAggregationPanelData = { this . setAggregationPanelData }
Original file line number Diff line number Diff line change @@ -560,7 +560,7 @@ export default class BrowserTable extends React.Component {
560
560
onResize = { this . props . handleResize }
561
561
onAddColumn = { this . props . onAddColumn }
562
562
preventSchemaEdits = { this . context . preventSchemaEdits }
563
- isDataLoaded = { ! ! this . props . data }
563
+ isDataLoaded = { ! this . props . isLoading }
564
564
setSelectedObjectId = { this . props . setSelectedObjectId }
565
565
setCurrent = { this . props . setCurrent }
566
566
/>
You can’t perform that action at this time.
0 commit comments