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

Upgrade plugin dependencies to React 18 #212

Merged
merged 34 commits into from
Sep 26, 2023

Conversation

fridgepoet
Copy link
Member

What this PR does / why we need it:
This upgrades plugin dependencies to React 18.

Which issue(s) this PR fixes:

Fixes #205

Special notes for your reviewer:
Context: https://raintank-corp.slack.com/archives/C01LVB0CYTW/p1692336771498409

@fridgepoet fridgepoet force-pushed the 205-upgrade-plugin-dependencies-to-react-18 branch from 79cabe2 to f30ffb5 Compare August 29, 2023 14:54
@idastambuk idastambuk force-pushed the 205-upgrade-plugin-dependencies-to-react-18 branch from 6cf2694 to ec39537 Compare September 5, 2023 09:27
@idastambuk idastambuk marked this pull request as ready for review September 11, 2023 12:57
@idastambuk idastambuk requested a review from a team as a code owner September 11, 2023 12:57
Copy link
Member

@sarahzinger sarahzinger left a comment

Choose a reason for hiding this comment

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

did a very brief test and the datasource seems to load ok for me! Let me know if there's anything in particular that would be good to test!

@@ -26,18 +26,18 @@
"@babel/core": "^7.16.7",
"@emotion/css": "^11.1.3",
"@grafana/aws-sdk": "0.1.2",
"@grafana/data": "8.4.11",
"@grafana/e2e": "8.4.11",
"@grafana/data": "10.0.3",
Copy link
Member

Choose a reason for hiding this comment

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

Let's make sure we test this change with 9.4 for AMG, maybe we can reach out to folks at AWS to test on their end

selectedEntityValue && selectedComponentValue
? {
[DataBindingLabelKeys.entityId]: selectedEntityValue,
Copy link
Member

Choose a reason for hiding this comment

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

Just curious why were these changes necessary?

Copy link
Contributor

Choose a reason for hiding this comment

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

This change is required due to the change in the definition for selectedDataBinding in iot-app-kit.

package.json Outdated
@@ -118,6 +119,12 @@
"debug": "^4.0.0",
"underscore": "^1.12.1",
"d3-color": "^3.1.0",
"log4js": "^6.4.0"
"log4js": "^6.4.0",
"react-dnd": "^16.0.1",
Copy link
Contributor

Choose a reason for hiding this comment

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

looks like react-dnd@16.0.1 is the version that iot-app-kit/* v7 uses so i don't think we need the resolution here.

Copy link
Contributor

Choose a reason for hiding this comment

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

Good catch!

CHANGELOG.md Outdated
@@ -1,8 +1,13 @@
# Changelog

## 1.8.1
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
## 1.8.1
## 1.8.0

package.json Outdated
@@ -1,9 +1,9 @@
{
"name": "grafana-iot-twinmaker-app",
"version": "1.7.1",
"version": "1.8.1",
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"version": "1.8.1",
"version": "1.8.0",

@hwandersman hwandersman merged commit dbfd00e into main Sep 26, 2023
4 checks passed
@hwandersman hwandersman deleted the 205-upgrade-plugin-dependencies-to-react-18 branch September 26, 2023 20:44
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.

Upgrade plugin dependencies to React 18
7 participants