From 2eb6a8bc45099bf8a10b2e65e80d371fb38f50b2 Mon Sep 17 00:00:00 2001 From: Mikhail <47795110+mikhailredis@users.noreply.github.com> Date: Sun, 19 Dec 2021 20:23:19 -0500 Subject: [PATCH] Update Components naming --- CHANGELOG.md | 1 + .../ConfigEditor.test.tsx} | 2 +- .../config-editor.tsx => ConfigEditor/ConfigEditor.tsx} | 0 src/components/ConfigEditor/index.ts | 1 + .../QueryEditor.test.tsx} | 2 +- .../query-editor.tsx => QueryEditor/QueryEditor.tsx} | 2 +- src/components/QueryEditor/index.ts | 1 + src/components/config-editor/index.ts | 1 - src/components/index.ts | 4 ++-- src/components/query-editor/index.ts | 1 - src/data-source/index.ts | 1 - .../data-source.test.ts => datasource/datasource.test.ts} | 2 +- src/{data-source/data-source.ts => datasource/datasource.ts} | 0 src/datasource/index.ts | 1 + src/module.ts | 4 ++-- 15 files changed, 12 insertions(+), 11 deletions(-) rename src/components/{config-editor/config-editor.test.tsx => ConfigEditor/ConfigEditor.test.tsx} (99%) rename src/components/{config-editor/config-editor.tsx => ConfigEditor/ConfigEditor.tsx} (100%) create mode 100644 src/components/ConfigEditor/index.ts rename src/components/{query-editor/query-editor.test.tsx => QueryEditor/QueryEditor.test.tsx} (99%) rename src/components/{query-editor/query-editor.tsx => QueryEditor/QueryEditor.tsx} (99%) create mode 100644 src/components/QueryEditor/index.ts delete mode 100644 src/components/config-editor/index.ts delete mode 100644 src/components/query-editor/index.ts delete mode 100644 src/data-source/index.ts rename src/{data-source/data-source.test.ts => datasource/datasource.test.ts} (99%) rename src/{data-source/data-source.ts => datasource/datasource.ts} (100%) create mode 100644 src/datasource/index.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 6148812..1ef022a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ### Bug fixes - Grafana template variables not working for the Default datasource (#242) +- Fix JSON.GET: interface conversion: interface {} is string (#246) ## 2.0.0 (2021-11-10) diff --git a/src/components/config-editor/config-editor.test.tsx b/src/components/ConfigEditor/ConfigEditor.test.tsx similarity index 99% rename from src/components/config-editor/config-editor.test.tsx rename to src/components/ConfigEditor/ConfigEditor.test.tsx index c41ebb0..fdbf9ba 100644 --- a/src/components/config-editor/config-editor.test.tsx +++ b/src/components/ConfigEditor/ConfigEditor.test.tsx @@ -4,7 +4,7 @@ import { DataSourceSettings } from '@grafana/data'; import { RadioButtonGroup } from '@grafana/ui'; import { ClientTypeValue } from '../../constants'; import { RedisDataSourceOptions } from '../../types'; -import { ConfigEditor } from './config-editor'; +import { ConfigEditor } from './ConfigEditor'; /** * Override Options diff --git a/src/components/config-editor/config-editor.tsx b/src/components/ConfigEditor/ConfigEditor.tsx similarity index 100% rename from src/components/config-editor/config-editor.tsx rename to src/components/ConfigEditor/ConfigEditor.tsx diff --git a/src/components/ConfigEditor/index.ts b/src/components/ConfigEditor/index.ts new file mode 100644 index 0000000..a632b9d --- /dev/null +++ b/src/components/ConfigEditor/index.ts @@ -0,0 +1 @@ +export * from './ConfigEditor'; diff --git a/src/components/query-editor/query-editor.test.tsx b/src/components/QueryEditor/QueryEditor.test.tsx similarity index 99% rename from src/components/query-editor/query-editor.test.tsx rename to src/components/QueryEditor/QueryEditor.test.tsx index dfffcb1..7535fac 100644 --- a/src/components/query-editor/query-editor.test.tsx +++ b/src/components/QueryEditor/QueryEditor.test.tsx @@ -12,7 +12,7 @@ import { RedisTimeSeries, } from '../../redis'; import { getQuery } from '../../tests/utils'; -import { QueryEditor } from './query-editor'; +import { QueryEditor } from './QueryEditor'; type ShallowComponent = ShallowWrapper; diff --git a/src/components/query-editor/query-editor.tsx b/src/components/QueryEditor/QueryEditor.tsx similarity index 99% rename from src/components/query-editor/query-editor.tsx rename to src/components/QueryEditor/QueryEditor.tsx index 6c0722b..cc9f2fe 100644 --- a/src/components/query-editor/query-editor.tsx +++ b/src/components/QueryEditor/QueryEditor.tsx @@ -5,7 +5,7 @@ import { QueryEditorProps, SelectableValue } from '@grafana/data'; import { getDataSourceSrv } from '@grafana/runtime'; import { Button, InlineFormLabel, LegacyForms, RadioButtonGroup, Select, TextArea } from '@grafana/ui'; import { StreamingDataType, StreamingDataTypes } from '../../constants'; -import { DataSource } from '../../data-source'; +import { DataSource } from '../../datasource'; import { Aggregations, AggregationValue, diff --git a/src/components/QueryEditor/index.ts b/src/components/QueryEditor/index.ts new file mode 100644 index 0000000..587eb7b --- /dev/null +++ b/src/components/QueryEditor/index.ts @@ -0,0 +1 @@ +export * from './QueryEditor'; diff --git a/src/components/config-editor/index.ts b/src/components/config-editor/index.ts deleted file mode 100644 index 493e451..0000000 --- a/src/components/config-editor/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './config-editor'; diff --git a/src/components/index.ts b/src/components/index.ts index d657ff2..8764d55 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -1,2 +1,2 @@ -export * from './config-editor'; -export * from './query-editor'; +export * from './ConfigEditor'; +export * from './QueryEditor'; diff --git a/src/components/query-editor/index.ts b/src/components/query-editor/index.ts deleted file mode 100644 index 799f6df..0000000 --- a/src/components/query-editor/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './query-editor'; diff --git a/src/data-source/index.ts b/src/data-source/index.ts deleted file mode 100644 index af1d9b8..0000000 --- a/src/data-source/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './data-source'; diff --git a/src/data-source/data-source.test.ts b/src/datasource/datasource.test.ts similarity index 99% rename from src/data-source/data-source.test.ts rename to src/datasource/datasource.test.ts index c3440e2..af187fa 100644 --- a/src/data-source/data-source.test.ts +++ b/src/datasource/datasource.test.ts @@ -14,7 +14,7 @@ import { ClientTypeValue, StreamingDataType } from '../constants'; import { QueryTypeValue, RedisQuery } from '../redis'; import { getQuery } from '../tests/utils'; import { RedisDataSourceOptions } from '../types'; -import { DataSource } from './data-source'; +import { DataSource } from './datasource'; /** * Instance Settings diff --git a/src/data-source/data-source.ts b/src/datasource/datasource.ts similarity index 100% rename from src/data-source/data-source.ts rename to src/datasource/datasource.ts diff --git a/src/datasource/index.ts b/src/datasource/index.ts new file mode 100644 index 0000000..b847327 --- /dev/null +++ b/src/datasource/index.ts @@ -0,0 +1 @@ +export * from './datasource'; diff --git a/src/module.ts b/src/module.ts index a6ca0e0..3f035dd 100644 --- a/src/module.ts +++ b/src/module.ts @@ -1,6 +1,6 @@ -import { ConfigEditor, QueryEditor } from 'components'; import { DataSourcePlugin } from '@grafana/data'; -import { DataSource } from './data-source'; +import { ConfigEditor, QueryEditor } from './components'; +import { DataSource } from './datasource'; import { RedisQuery } from './redis'; import { RedisDataSourceOptions } from './types';