Skip to content

Commit f572a28

Browse files
authored
Merge branch 'alpha' into fix/context-menu-position
2 parents 3a901fe + 06fc86a commit f572a28

File tree

5 files changed

+29
-4
lines changed

5 files changed

+29
-4
lines changed

changelogs/CHANGELOG_alpha.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# [7.1.0-alpha.12](https://github.com/parse-community/parse-dashboard/compare/7.1.0-alpha.11...7.1.0-alpha.12) (2025-04-29)
2+
3+
4+
### Bug Fixes
5+
6+
* Clicking on pointer in data browser when using pagination does not reset to first page ([#2767](https://github.com/parse-community/parse-dashboard/issues/2767)) ([ab512e5](https://github.com/parse-community/parse-dashboard/commit/ab512e52d137cdb30167ece53a9ce12c38f5d155))
7+
8+
# [7.1.0-alpha.11](https://github.com/parse-community/parse-dashboard/compare/7.1.0-alpha.10...7.1.0-alpha.11) (2025-04-28)
9+
10+
11+
### Bug Fixes
12+
13+
* Data loading indicator not showing when using pagination ([#2768](https://github.com/parse-community/parse-dashboard/issues/2768)) ([62d7aec](https://github.com/parse-community/parse-dashboard/commit/62d7aec3c43c634f8dc632ef7a563cfdad5cd773))
14+
115
# [7.1.0-alpha.10](https://github.com/parse-community/parse-dashboard/compare/7.1.0-alpha.9...7.1.0-alpha.10) (2025-04-17)
216

317

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "parse-dashboard",
3-
"version": "7.1.0-alpha.10",
3+
"version": "7.1.0-alpha.12",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/parse-community/parse-dashboard"

src/dashboard/Data/Browser/Browser.react.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -898,6 +898,10 @@ class Browser extends DashboardView {
898898

899899
async fetchParseData(source, filters) {
900900
const { useMasterKey, skip, limit } = this.state;
901+
this.setLoading(true);
902+
this.setState({
903+
data: null,
904+
})
901905
const query = await queryFromFilters(source, filters);
902906
const sortDir = this.state.ordering[0] === '-' ? '-' : '+';
903907
const field = this.state.ordering.substr(sortDir === '-' ? 1 : 0);
@@ -927,6 +931,8 @@ class Browser extends DashboardView {
927931
this.setState({ isUnique, uniqueField });
928932

929933
const data = await promise;
934+
935+
this.setLoading(false);
930936
return data;
931937
}
932938

@@ -1166,6 +1172,10 @@ class Browser extends DashboardView {
11661172
this.props.navigate(
11671173
generatePath(this.context, `browser/${className}?filters=${encodeURIComponent(filters)}`)
11681174
);
1175+
1176+
this.setState({
1177+
skip: 0,
1178+
});
11691179
}
11701180

11711181
handlePointerCmdClick({ className, id, field = 'objectId' }) {
@@ -2089,6 +2099,7 @@ class Browser extends DashboardView {
20892099
classwiseCloudFunctions={this.state.classwiseCloudFunctions}
20902100
callCloudFunction={this.fetchAggregationPanelData}
20912101
isLoadingCloudFunction={this.state.isLoading}
2102+
isLoading={this.state.isLoading}
20922103
setLoading={this.setLoading}
20932104
AggregationPanelData={this.state.AggregationPanelData}
20942105
setAggregationPanelData={this.setAggregationPanelData}

src/dashboard/Data/Browser/BrowserTable.react.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ export default class BrowserTable extends React.Component {
560560
onResize={this.props.handleResize}
561561
onAddColumn={this.props.onAddColumn}
562562
preventSchemaEdits={this.context.preventSchemaEdits}
563-
isDataLoaded={!!this.props.data}
563+
isDataLoaded={!this.props.isLoading}
564564
setSelectedObjectId={this.props.setSelectedObjectId}
565565
setCurrent={this.props.setCurrent}
566566
/>

0 commit comments

Comments
 (0)