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

[Backend] Merge 'master' changes into the backend #875

Merged
merged 28 commits into from
Jan 15, 2020

Conversation

alecxvs
Copy link
Contributor

@alecxvs alecxvs commented Jan 14, 2020

Merging master into the backend + some compilation fixes

mjtrangoni and others added 28 commits October 4, 2019 18:10
* problems: update panel schema

* update packages (build with node 12)

* problems: use datasource from target

* problems: fix query editor after schema update

* problems: fix list layout

* update circleci node image to 12

* fix tests
Like the other aggregation functions, the datapoints need to be sorted in
time before calling groupBy_perf().
* fix not acknowledged problem color with a message

* fix not acknowledged problem color with a message, closes grafana#857
* refactor: convert module to typescript

* refactor: covert utils to typescript

* variable query editor WIP

* variable editor: fix type error after grafana/ui update

* variable editor: use FormLabel from grafana/ui

* variable editor: refactor

* variable editor: input validation and highlights

* variable editor: fix tests

* variable query: fix backward compatibility with empty queries

* fix linter errors

* variable editor: fix variable replacement in queries
Comment on lines +33 to +36
"@grafana/data": "canary",
"@grafana/runtime": "canary",
"@grafana/toolkit": "canary",
"@grafana/ui": "canary",
Copy link
Contributor Author

@alecxvs alecxvs Jan 14, 2020

Choose a reason for hiding this comment

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

There's currently an issue that's failing unit tests if we don't mock @grafana/ui and @grafana/runtime: grafana/grafana#20921

However there's also apparently an issue in master that's causing a different error entirely. Neither one works, but we're going to need 6.6 (or whatever release has the fix).

tl;dr Jest tests are broken because of Grafana packages, we can't fix it and need to wait for a good version of @grafana/ui

Copy link
Collaborator

Choose a reason for hiding this comment

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

Aha, ok, that makes sense. I'll try to investigate. It seems, I remember some build error in grafana/ui related to Table interface.

"@types/react": "^16.4.6",
"@types/react-dom": "^16.0.11",
"@types/react": "^16.9.17",
"@types/react-table": "^6.8.6",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Current builds of @grafana/ui started using react-table 7. Without defining our own version of the types here, it was using types 7.x and throwing errors due to type changes in the next version.

@alexanderzobnin alexanderzobnin merged commit 92e7761 into grafana:backend Jan 15, 2020
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.

7 participants