Skip to content

Closes #351 client error when no actions defined #352

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
timgl merged 1 commit into from
Mar 13, 2020
Merged

Closes #351 client error when no actions defined #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 9 additions & 3 deletions frontend/src/scenes/trends/ActionFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React, { Component } from 'react'
import { CloseButton, selectStyle, Card } from '../../lib/utils'
import { CloseButton } from '../../lib/utils'
import { Dropdown } from '../../lib/components/Dropdown'
import { ActionSelectBox } from './ActionSelectBox'
import { Link } from 'react-router-dom'

export class ActionFilter extends Component {
constructor(props) {
Expand Down Expand Up @@ -104,7 +105,7 @@ export class ActionFilter extends Component {
render() {
let { actions } = this.props
let { actionFilters } = this.state
return actions ? (
return actions && actions.length > 0 ? (
<div>
{actionFilters &&
actionFilters.map((action_filter, index) => {
Expand Down Expand Up @@ -133,6 +134,11 @@ export class ActionFilter extends Component {
Add action
</button>
</div>
) : null
) : (
<div>
You don't have any actions defined yet.{' '}
<Link to="/action">Click here to define an action.</Link>
</div>
)
}
}
2 changes: 1 addition & 1 deletion frontend/src/scenes/trends/ActionsGraph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export class ActionsGraph extends Component {
}
fetchActions() {
api.get('api/action').then(actions => {
if (!this.state.filters.actions)
if (!this.state.filters.actions && actions.results.length > 0)
this.setFilters({
actions: [
{ id: actions.results[actions.results.length - 1].id },
Expand Down