Skip to content

Commit

Permalink
Merge branch 'alpha' into fix/express-mount-path
Browse files Browse the repository at this point in the history
  • Loading branch information
mtrezza authored Jun 8, 2023
2 parents 412e41d + 27cdaf1 commit 64126a5
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,3 +151,6 @@ jobs:
run: ./scripts/before_script.sh
env:
CI: true
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
42 changes: 42 additions & 0 deletions changelogs/CHANGELOG_alpha.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,45 @@
# [5.2.0-alpha.11](https://github.com/ParsePlatform/parse-dashboard/compare/5.2.0-alpha.10...5.2.0-alpha.11) (2023-06-08)


### Bug Fixes

* Scroll position is preserved when re-opening the same class in data browser via navigation bar ([#2445](https://github.com/ParsePlatform/parse-dashboard/issues/2445)) ([667675c](https://github.com/ParsePlatform/parse-dashboard/commit/667675c031b0483be210a88da3b159f5f815d6fb))

# [5.2.0-alpha.10](https://github.com/ParsePlatform/parse-dashboard/compare/5.2.0-alpha.9...5.2.0-alpha.10) (2023-06-01)


### Bug Fixes

* Option missing for Parse Config parameter to require master key ([#2440](https://github.com/ParsePlatform/parse-dashboard/issues/2440)) ([6623369](https://github.com/ParsePlatform/parse-dashboard/commit/66233698b333422f306dc7024949aef2ea028f34))

# [5.2.0-alpha.9](https://github.com/ParsePlatform/parse-dashboard/compare/5.2.0-alpha.8...5.2.0-alpha.9) (2023-05-27)


### Bug Fixes

* Dashboard crashes when adding a row with modal in a class that contains a pointer to another class that contains an array of pointers ([#2416](https://github.com/ParsePlatform/parse-dashboard/issues/2416)) ([286269f](https://github.com/ParsePlatform/parse-dashboard/commit/286269f3e2c4e1c83b14003ce72caaf1f39b16c1))

# [5.2.0-alpha.8](https://github.com/ParsePlatform/parse-dashboard/compare/5.2.0-alpha.7...5.2.0-alpha.8) (2023-05-27)


### Bug Fixes

* Cannot navigate to nested relation field in data browser ([#2420](https://github.com/ParsePlatform/parse-dashboard/issues/2420)) ([e7ace9e](https://github.com/ParsePlatform/parse-dashboard/commit/e7ace9efa068b92c5cf0e5ccdad169ac7d71e81a))

# [5.2.0-alpha.7](https://github.com/ParsePlatform/parse-dashboard/compare/5.2.0-alpha.6...5.2.0-alpha.7) (2023-05-27)


### Bug Fixes

* File uploading status not updating in data browser ([#2422](https://github.com/ParsePlatform/parse-dashboard/issues/2422)) ([e761f97](https://github.com/ParsePlatform/parse-dashboard/commit/e761f9715a8366466c6620994ce698adbbfc48cd))

# [5.2.0-alpha.6](https://github.com/ParsePlatform/parse-dashboard/compare/5.2.0-alpha.5...5.2.0-alpha.6) (2023-05-27)


### Bug Fixes

* Text input cursor jumps to first position when writing long text ([#2413](https://github.com/ParsePlatform/parse-dashboard/issues/2413)) ([422ffb2](https://github.com/ParsePlatform/parse-dashboard/commit/422ffb2897bb2664eb47b5aaad5094a8b39431bf))

# [5.2.0-alpha.5](https://github.com/ParsePlatform/parse-dashboard/compare/5.2.0-alpha.4...5.2.0-alpha.5) (2023-05-27)


Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "parse-dashboard",
"version": "5.2.0-alpha.5",
"version": "5.2.0-alpha.11",
"repository": {
"type": "git",
"url": "https://github.com/ParsePlatform/parse-dashboard"
Expand Down
5 changes: 4 additions & 1 deletion src/components/BrowserCell/BrowserCell.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export default class BrowserCell extends Component {
this.copyableValue = this.props.value.id;
}
else if (this.props.type === 'Array') {
if ( this.props.value[0] && typeof this.props.value[0] === 'object' && this.props.value[0].__type === 'Pointer' ) {
if ( this.props.value[0] && typeof this.props.value[0] === 'object' && this.props.value[0].__type === 'Pointer' && typeof this.props.onPointerClick === 'function' ) {
const array = [];
this.props.value.map( (v, i) => {
if ( typeof v !== 'object' || v.__type !== 'Pointer' ) {
Expand Down Expand Up @@ -177,6 +177,9 @@ export default class BrowserCell extends Component {
componentDidUpdate(prevProps) {
if ( this.props.value !== prevProps.value ) {
this.renderCellContent();
this.props.value._previousSave
?.then(() => this.renderCellContent())
?.catch(err => console.log(err))
}
if (this.props.current) {
const node = this.cellRef.current;
Expand Down
1 change: 1 addition & 0 deletions src/components/TextInput/TextInput.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class TextInput extends React.Component {
if (props.multiline !== this.props.multiline) {
const node = props.forwardedRef.current;
node.focus();
if (this.props.value) node.setSelectionRange(this.props.value.length, this.props.value.length);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/Data/Browser/Browser.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ class Browser extends DashboardView {

getRelationURL() {
const relation = this.state.relation;
const className = this.props.params.className;
const className = relation.parent.className;
const entityId = relation.parent.id;
const relationName = relation.key;
return generatePath(this.context, `browser/${className}/${entityId}/${relationName}`);
Expand Down
4 changes: 4 additions & 0 deletions src/dashboard/Data/Browser/BrowserTable.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ export default class BrowserTable extends React.Component {
} else if (this.props.ordering !== props.ordering) {
this.setState({ offset: 0 });
this.tableRef.current.scrollTop = 0;
} else if (this.props.filters.size !== props.filters.size) {
this.setState({ offset: 0 }, () => {
this.tableRef.current.scrollTop = 0;
});
}
}

Expand Down
5 changes: 2 additions & 3 deletions src/dashboard/Data/Config/Config.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ class Config extends TableView {
}

renderExtras() {
const { currentApp = {} } = this.context;
let extras = null;
if (this.state.modalOpen) {
extras = (
Expand All @@ -69,7 +68,7 @@ class Config extends TableView {
type={this.state.modalType}
value={this.state.modalValue}
masterKeyOnly={this.state.modalMasterKeyOnly}
parseServerVersion={currentApp.serverInfo && currentApp.serverInfo.parseServerVersion} />
parseServerVersion={this.context.serverInfo?.parseServerVersion} />
);
} else if (this.state.showDeleteParameterDialog) {
extras = (
Expand Down Expand Up @@ -129,7 +128,7 @@ class Config extends TableView {
}
openModal()
}

let openDeleteParameterDialog = () => this.setState({
showDeleteParameterDialog: true,
modalParam: data.param
Expand Down

0 comments on commit 64126a5

Please sign in to comment.