Skip to content
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.

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

Inline Label Editing from Dashboards Index #12384

Merged
merged 27 commits into from
Mar 8, 2019

Conversation

alexpaxton
Copy link
Contributor

@alexpaxton alexpaxton commented Mar 6, 2019

Closes #12233

  • Using ILabel type from @influxdata/influx wherever possible, had to touch a lot of files because of this
  • Updated labels config page slightly
  • Created createLabelAJAX which returns the newly created label for use in inline label creation (must be created the immediately added to a dashboard)
  • Removed dashboards unit test in favor of stronger e2e dashboards index tests
  • Split cypress tool createLabel into two functions:
    • createAndAddLabel
    • createLabel

Checklist:

  • Rebased/mergeable
  • Tests pass

alexpaxton and others added 24 commits March 4, 2019 18:04
Co-Authored-By: Delmer <ofthedelmer@users.noreply.github.com>
Co-Authored-By: Delmer <ofthedelmer@users.noreply.github.com>
Co-Authored-By: Andrew Watkins <121watts@users.noreply.github.com>
Everything the unit test is testing is also tested by the e2e test

Co-Authored-By: Delmer <ofthedelmer@users.noreply.github.com>
Co-Authored-By: Delmer <ofthedelmer@users.noreply.github.com>
Co-Authored-By: Andrew Watkins <121watts@users.noreply.github.com>
Co-Authored-By: Delmer <ofthedelmer@users.noreply.github.com>
Co-Authored-By: Andrew Watkins <121watts@users.noreply.github.com>
Co-Authored-By: Delmer <ofthedelmer@users.noreply.github.com>
Co-Authored-By: Andrew Watkins <121watts@users.noreply.github.com>
@alexpaxton alexpaxton requested a review from mavarius March 6, 2019 23:12
proto/bin_gen.go Outdated
@@ -84,7 +84,7 @@ func systemJson() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "system.json", size: 30129, mode: os.FileMode(420), modTime: time.Unix(1548273842, 0)}
info := bindataFileInfo{name: "system.json", size: 30129, mode: os.FileMode(420), modTime: time.Unix(1548960115, 0)}
Copy link
Contributor

Choose a reason for hiding this comment

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

What is this? Was it meant to be part of this PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I’ll have to revert these changes

if (onDelete) {
onDelete(id)
}
onDelete(id)
Copy link
Contributor

Choose a reason for hiding this comment

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

onDelete is optional, perhaps this should remain in an if statement.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I took it out because the button that calls the delete function is also conditionally rendered with the same check, seemed redundant. I can add this guard back in to be extra safe

@alexpaxton alexpaxton merged commit d2bd4b7 into master Mar 8, 2019
@alexpaxton alexpaxton deleted the feat/dashboards-inline-labels branch March 8, 2019 17:11
@alexpaxton alexpaxton mentioned this pull request Mar 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants