Skip to content

Commit 6448835

Browse files
committed
Removes usage from Parse.Promise
- Use native Promises instead
1 parent d2cc82c commit 6448835

38 files changed

+139
-345
lines changed

Parse-Dashboard/parse-dashboard-config.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"apps": [{
3-
"serverURL": "",
4-
"appId": "",
5-
"masterKey": "",
3+
"serverURL": "http://localhost:1337/parse",
4+
"appId": "hello",
5+
"masterKey": "world",
66
"appName": "",
77
"iconName": "",
88
"primaryBackgroundColor": "",

package-lock.json

Lines changed: 14 additions & 183 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
@@ -70,7 +70,7 @@
7070
"jest-cli": "^23.2.0",
7171
"js-beautify": "~1.7.5",
7272
"marked": "^0.4.0",
73-
"node-sass": "^4.9.0",
73+
"node-sass": "^4.9.2",
7474
"parse": "^2.0.0",
7575
"path-to-regexp": "^2.2.1",
7676
"prismjs": "~1.15.0",

src/components/ACLEditor/ACLEditor.react.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,15 @@ function validateEntry(text) {
1515
new Parse.Query(Parse.User).equalTo('objectId', text)
1616
);
1717
let roleQuery = new Parse.Query(Parse.Role).equalTo('name', text);
18-
let promise = new Parse.Promise();
19-
Parse.Promise.when(userQuery.find({ useMasterKey: true }), roleQuery.find({ useMasterKey: true })).then((user, role) => {
18+
return Promise.all([userQuery.find({ useMasterKey: true }), roleQuery.find({ useMasterKey: true })]).then(([user, role]) => {
2019
if (user.length > 0) {
21-
promise.resolve({ user: user[0] });
20+
return { user: user[0] };
2221
} else if (role.length > 0) {
23-
promise.resolve({ role: role[0] });
22+
return { role: role[0] };
2423
} else {
25-
promise.reject();
24+
throw new Error();
2625
}
2726
});
28-
29-
return promise;
3027
}
3128

3229
function toPerms(acl) {

src/components/FlowView/FlowView.react.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ export default class FlowView extends React.Component {
130130
onSubmit({ changes, fields, setField, resetFields }).then(() => {
131131
this.setState({ saveState: SaveButton.States.SUCCEEDED });
132132
afterSave({ fields, setField, resetFields });
133-
}).fail(({ message, error, notice, errors = [] }) => {
133+
}).catch(({ message, error, notice, errors = [] }) => {
134134
this.setState({
135135
saveState: SaveButton.States.FAILED,
136136
saveError: errors.join(' ') || message || error || notice || 'An error occurred',

src/components/LiveReload/LiveReload.example.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
* the root directory of this source tree.
77
*/
88
import LiveReload from 'components/LiveReload/LiveReload.react';
9-
import Parse from 'parse';
109
import React from 'react';
1110

1211
export const component = LiveReload;
1312
export const demos = [
1413
{
1514
render: () => <LiveReload
16-
source={() => Parse.Promise.as(Math.random())}
15+
source={() => Promise.resolve(Math.random())}
1716
render={num => <span>{num}</span>}
1817
refreshIntervalMillis={100}
1918
initialData={0}/>,

src/components/LiveReload/LiveReload.react.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default class LiveReload extends React.Component {
4545
}
4646
promise.then(data => {
4747
this.setState({currentData: data});
48-
}).always(() => {
48+
}).finally(() => {
4949
if (this.shouldContinueReloading) {
5050
this.timer = setTimeout(this.fetchNewData.bind(this), this.refreshIntervalMillis);
5151
}

src/components/PermissionsDialog/PermissionsDialog.example.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,31 @@ export const component = PermissionsDialog;
1414

1515
function validateSimple(text) {
1616
if (text.startsWith('i')) {
17-
return Parse.Promise.as({ user: { id: text } });
17+
return Promise.resolve({ user: { id: text } });
1818
}
1919
if (text.startsWith('r')) {
20-
return Parse.Promise.as({ role: new Parse.Role(text, new Parse.ACL()) });
20+
return Promise.resolve({ role: new Parse.Role(text, new Parse.ACL()) });
2121
}
2222
if (text.startsWith('u')) {
23-
return Parse.Promise.as({ user: { id: 'i' + ((Math.random() * 10000) | 0)}});
23+
return Promise.resolve({ user: { id: 'i' + ((Math.random() * 10000) | 0)}});
2424
}
25-
return Parse.Promise.error();
25+
return Promise.reject();
2626
}
2727

2828
function validateAdvanced(text) {
2929
if (text.startsWith('i')) {
30-
return Parse.Promise.as({ user: { id: text } });
30+
return Promise.resolve({ user: { id: text } });
3131
}
3232
if (text.startsWith('r')) {
33-
return Parse.Promise.as({ role: new Parse.Role(text, new Parse.ACL()) });
33+
return Promise.resolve({ role: new Parse.Role(text, new Parse.ACL()) });
3434
}
3535
if (text.startsWith('u')) {
36-
return Parse.Promise.as({ user: { id: 'i' + ((Math.random() * 10000) | 0)}});
36+
return Promise.resolve({ user: { id: 'i' + ((Math.random() * 10000) | 0)}});
3737
}
3838
if (text.startsWith('p')) {
39-
return Parse.Promise.as({ pointer: text });
39+
return Promise.resolve({ pointer: text });
4040
}
41-
return Parse.Promise.error();
41+
return Promise.reject();
4242
}
4343

4444
class DialogDemo extends React.Component {

src/components/PushAudiencesSelector/PushAudiencesBaseRow.react.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export default class PushAudiencesBaseRow extends React.Component {
4040
this.xhrHandle = xhr;
4141
promise.then(({ approximate, count }) => {
4242
this.setState({ approximate, count });
43-
});
43+
}, () => {});
4444
}
4545

4646
componentWillMount() {

0 commit comments

Comments
 (0)