Skip to content

Fix audience conditions when Installation class does not exist #1451

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
merged 5 commits into from
Mar 4, 2020
Merged

Fix audience conditions when Installation class does not exist #1451

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
507319a
Fix audience conditions when Installation class does not exist
davimacedo Jan 17, 2020
91a875d
Merge branch 'master' into audienceConditionWithNoInstallation
paivaric Jan 20, 2020
19a478b
Merge branch 'master' into audienceConditionWithNoInstallation
davimacedo Feb 29, 2020
81da70e
Merge branch 'master' into audienceConditionWithNoInstallation
davimacedo Mar 4, 2020
3f76230
Improve code readability
davimacedo Mar 4, 2020
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
9 changes: 7 additions & 2 deletions src/components/PushAudienceDialog/PushAudienceDialog.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export default class PushAudienceDialog extends React.Component {
audienceName: '',
audienceSize: undefined,
approximate: false,
errorMessage: undefined,
};
}

Expand Down Expand Up @@ -91,6 +92,10 @@ export default class PushAudienceDialog extends React.Component {
}

handleAddCondition() {
if (!this.props.schema || !Object.keys(this.props.schema).length) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NO NEED TO CHANGE, but whenever I see something like this, I change it to:

!(this.props.schema && Object.keys(this.props.schema).length)

it's easier for ME to read (ymmv)

this.setState({ errorMessage: 'You first need to create the Installation class before adding conditions to an audience.' });
return;
}
let available = Filters.availableFilters(this.props.schema, this.state.filters);
let field = Object.keys(available)[0];
this.setState(({ filters }) => ({
Expand Down Expand Up @@ -258,9 +263,9 @@ export default class PushAudienceDialog extends React.Component {
</div>
{futureUseSegment}
<FormNote
show={Boolean(this.props.errorMessage && this.props.errorMessage.length > 0)}
show={Boolean(this.props.errorMessage && this.props.errorMessage.length > 0 || this.state.errorMessage && this.state.errorMessage.length > 0)}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm not 100% sure it matters from operator precedence standpoint, but it would be easier to read if you put the two conditionals in parens:

(this.props.errorMessage && this.props.errorMessage.length > 0) || (this.state.errorMessage && this.state.errorMessage.length > 0)

color='red' >
{this.props.errorMessage}
{this.props.errorMessage || this.state.errorMessage}
</FormNote>
</Modal>
);
Expand Down