Skip to content

Custom redshift language #154

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
merged 5 commits into from
Jun 16, 2022
Merged

Custom redshift language #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58668fa
render sql editor from grafana experimental if feature toggle is enabled
sunker Jun 2, 2022
9eb22b1
load custom redshift language
sunker Jun 14, 2022
468a7b2
remove not used file
sunker Jun 14, 2022
4576e5f
use latest package version
sunker Jun 15, 2022
89ed1bc
fix typo and weird ts error
sunker Jun 16, 2022
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@grafana/runtime": "8.0.5",
"@grafana/toolkit": "8.0.5",
"@grafana/ui": "8.0.5",
"@grafana/experimental": "^0.0.2-canary.23",
"@grafana/experimental": "^0.0.2-canary.33",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.0.0",
"@testing-library/user-event": "^13.1.9",
Expand Down
9 changes: 8 additions & 1 deletion src/RedshiftSQLEditor/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { SQLEditor } from '@grafana/experimental';
import redshiftLanguageDefinition from 'language/definition';
import React from 'react';
import { RedshiftQuery } from 'types';

Expand All @@ -8,5 +9,11 @@ interface RawEditorProps {
}

export default function RedshiftSQLEditor({ query, onChange }: RawEditorProps) {
return <SQLEditor query={query.rawSQL} onChange={(rawSQL) => onChange({ ...query, rawSQL })}></SQLEditor>;
return (
<SQLEditor
query={query.rawSQL}
onChange={(rawSQL) => onChange({ ...query, rawSQL })}
language={redshiftLanguageDefinition}
></SQLEditor>
);
}
10 changes: 10 additions & 0 deletions src/language/definition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { LanguageDefinition } from '@grafana/experimental';
import { conf, language } from './language';

const redshiftLanguageDefinition: LanguageDefinition & { id: string } = {
id: 'redshift',
// TODO: Load language using code splitting instead: loader: () => import('./language'),
loader: () => Promise.resolve({ conf, language }),
Copy link
Collaborator Author

@sunker sunker Jun 14, 2022

Choose a reason for hiding this comment

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

This language is in no way heavy, but I would like to use code splitting here since that's the de facto way to load Monaco languages. However, when doing so webpack tries to resolve the script from the server root ([0].js), but it's placed in the public/plugins/grafana-redshift-datasource/0.js. Any idea on how to work around this @dprokop?

};

export default redshiftLanguageDefinition;
Loading