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

Migrate Annotation editor to React #261

Merged
merged 18 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .config/webpack/webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ const config = async (env): Promise<Configuration> => ({
'react-router',
'react-router-dom',
'd3',
'angular',
'@grafana/ui',
'@grafana/runtime',
'@grafana/data',
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/buind_n_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup Node.js environment
uses: actions/setup-node@v3
with:
node-version: '16'
node-version: '18'
cache: 'yarn'
- name: Install dependencies
run: yarn install --immutable --prefer-offline
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/is-compatible.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16'
node-version: '18'
cache: 'yarn'
- name: Install dependencies
run: yarn install --immutable --prefer-offline
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Node.js environment
uses: actions/setup-node@v3
with:
node-version: '16'
node-version: '18'
cache: 'yarn'

- name: Setup Go environment
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ services:
build:
context: ./.config
args:
grafana_version: ${GRAFANA_VERSION:-9.3.8}
grafana_version: ${GRAFANA_VERSION:-10.1.1}
ports:
- 3000:3000/tcp
- 2999:3000/tcp
volumes:
- ./dist:/var/lib/grafana/plugins/cognitedata-datasource
- ./provisioning:/etc/grafana/provisioning
2 changes: 1 addition & 1 deletion instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Once logged in you can see that CDF is installed.

5. To set up CDF, do the following:

Go to "Configuration" click Data Sources, then Add data source, and choose Cognite Data Fusion as "Type". Give the data source a name, provide the name of the project and your API key.
Go to "Configuration" click Data Sources, then Add data source, and choose Cognite Data Fusion as "Type". Give the data source a name, provide the name of the project and your OAuth credentials.

![Configuration](./images/image9.png)

Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cognite/cognite-grafana-datasource",
"version": "3.1.0",
"version": "4.0.0",
"description": "Cognite Data Fusion datasource",
"repository": "https://github.com/cognitedata/cognite-grafana-datasource",
"author": "Cognite AS",
Expand Down Expand Up @@ -38,7 +38,6 @@
"@testing-library/jest-dom": "^5.16.2",
"@testing-library/react": "^12.1.4",
"@types/glob": "^8.0.0",
"@types/grafana": "https://git@github.com/CorpGlory/types-grafana.git",
"@types/jest": "^29.2.2",
"@types/lodash": "^4.14.188",
"@types/ms": "^0.7.31",
Expand Down Expand Up @@ -100,9 +99,10 @@
},
"dependencies": {
"@emotion/css": "^11.1.3",
"@grafana/data": "^9.4.7",
"@grafana/runtime": "^9.4.7",
"@grafana/ui": "^9.4.7",
"@grafana/data": "^10.1.2",
"@grafana/runtime": "^10.1.2",
"@grafana/schema": "^10.1.2",
"@grafana/ui": "^10.1.2",
"deepdash": "^4.5.4",
"eslint-plugin-jsdoc": "^40.1.1",
"graphql": "^16.6.0",
Expand Down
154 changes: 0 additions & 154 deletions src/__tests__/__snapshots__/annotations.test.ts.snap

This file was deleted.

Loading