Skip to content

Bug fixes: target table parser in Push Notification Details #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
drew-gross merged 2 commits into from
Jul 9, 2016
Merged

Bug fixes: target table parser in Push Notification Details #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccf27f3
bug fixes: target table parser in Push Notification Details
hermanliang Jul 1, 2016
3b9ff1c
fill missing assignment
hermanliang Jul 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/dashboard/Push/PushDetails.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,17 @@ export default class PushDetails extends DashboardView {
}

renderTargetTable() {
return getTargetTable(this.state.pushDetails.get('query'), this.props.schema, tableStyles);
let classes = this.props.schema.data.get('classes');
let schema = {};
if(classes){
let installations = classes.get('_Installation');
if(typeof(installations) !== 'undefined'){
installations.forEach((type, col) => {
schema[col] = type;
});
}
}
return getTargetTable(this.state.pushDetails.get('query'), schema, tableStyles);
}

renderStatusTable() {
Expand Down
4 changes: 3 additions & 1 deletion src/lib/PushUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ let formatConstraintComponent = (key, operation, value, schema) => {
if(!value.constructor === Array) {
res = [key, `constraint is malformed (${operation} operator requires an array)`, ''];
} else if (!schema[key]) {
['', `Cannot perform operation on non-existent column ${key}`, ''];
res = ['', `Cannot perform operation on non-existent column ${key}`, ''];
} else if (schema[key]['type'] === 'Array'){
let isAll = operation === '$all';
res = [key,
Expand Down Expand Up @@ -190,6 +190,8 @@ export function formatConstraint(key, constraints, schema) {
break;
}
}
} else if(constraints.constructor === Boolean) {
rows.push([[key, 'is', constraints ? 'true' : 'false']]);
} else {
rows.push([[key, 'is', constraints]]);
}
Expand Down