Rename types

Author: marcusolsson

src/ConfigEditor.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
 import { DataSourceHttpSettings } from '@grafana/ui';
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
-import { MyDataSourceOptions } from './types';
+import { JsonApiDataSourceOptions } from './types';
 import { ConfigSettings } from './ConfigSettings';
 
-interface Props extends DataSourcePluginOptionsEditorProps<MyDataSourceOptions> {}
+interface Props extends DataSourcePluginOptionsEditorProps<JsonApiDataSourceOptions> {}
 
 export const ConfigEditor: React.FC<Props> = ({ options, onOptionsChange }) => {
   return (

src/ConfigSettings.tsx

@@ -3,10 +3,10 @@ import React, { ChangeEvent } from 'react';
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
 
 import { Field, Input } from '@grafana/ui';
-import { MyDataSourceOptions } from './types';
+import { JsonApiDataSourceOptions } from './types';
 import {} from '@emotion/core';
 
-type Props = Pick<DataSourcePluginOptionsEditorProps<MyDataSourceOptions>, 'options' | 'onOptionsChange'>;
+type Props = Pick<DataSourcePluginOptionsEditorProps<JsonApiDataSourceOptions>, 'options' | 'onOptionsChange'>;
 
 export const ConfigSettings: React.FC<Props> = ({ options, onOptionsChange }) => {
   const onChange = (e: ChangeEvent<HTMLInputElement>) => {

src/DataSource.ts

@@ -13,13 +13,13 @@ import {
 } from '@grafana/data';
 
 import API from './api';
-import { JsonApiQuery, MyVariableQuery, MyDataSourceOptions } from './types';
+import { JsonApiQuery, JsonApiVariableQuery, JsonApiDataSourceOptions } from './types';
 
-export class DataSource extends DataSourceApi<JsonApiQuery, MyDataSourceOptions> {
+export class DataSource extends DataSourceApi<JsonApiQuery, JsonApiDataSourceOptions> {
   api: API;
   queryParams: string;
 
-  constructor(instanceSettings: DataSourceInstanceSettings<MyDataSourceOptions>) {
+  constructor(instanceSettings: DataSourceInstanceSettings<JsonApiDataSourceOptions>) {
     super(instanceSettings);
     this.api = new API(instanceSettings.url!);
     this.queryParams = instanceSettings.jsonData.queryParams || '';
@@ -64,7 +64,7 @@ export class DataSource extends DataSourceApi<JsonApiQuery, MyDataSourceOptions>
    *
    * @param query
    */
-  async metricFindQuery?(query: MyVariableQuery): Promise<MetricFindValue[]> {
+  async metricFindQuery?(query: JsonApiVariableQuery): Promise<MetricFindValue[]> {
     if (!query.jsonPath) {
       return [];
     }

src/QueryEditor.tsx

@@ -3,11 +3,11 @@ import React, { ChangeEvent } from 'react';
 import { Icon, InlineFormLabel, Segment } from '@grafana/ui';
 import { QueryEditorProps } from '@grafana/data';
 import { DataSource } from './DataSource';
-import { MyDataSourceOptions, JsonApiQuery, defaultQuery } from './types';
+import { JsonApiDataSourceOptions, JsonApiQuery, defaultQuery } from './types';
 import { JsonPathQueryField } from './JsonPathQueryField';
 import { cx } from 'emotion';
 
-type Props = QueryEditorProps<DataSource, JsonApiQuery, MyDataSourceOptions>;
+type Props = QueryEditorProps<DataSource, JsonApiQuery, JsonApiDataSourceOptions>;
 
 export const QueryEditor: React.FC<Props> = ({ onRunQuery, onChange, query }) => {
   const { fields } = defaults(query, defaultQuery);

src/VariableQueryEditor.tsx

@@ -1,15 +1,15 @@
 import React, { useState } from 'react';
-import { MyVariableQuery } from './types';
+import { JsonApiVariableQuery } from './types';
 import { InlineFormLabel } from '@grafana/ui';
 import { JsonPathQueryField } from './JsonPathQueryField';
 
 interface VariableQueryProps {
-  query: MyVariableQuery;
-  onChange: (query: MyVariableQuery, definition: string) => void;
+  query: JsonApiVariableQuery;
+  onChange: (query: JsonApiVariableQuery, definition: string) => void;
 }
 
 export const VariableQueryEditor: React.FC<VariableQueryProps> = ({ onChange, query }) => {
-  const [state, setState] = useState<MyVariableQuery>(query);
+  const [state, setState] = useState<JsonApiVariableQuery>(query);
 
   const saveQuery = () => {
     onChange(state, state.jsonPath);

src/module.ts

@@ -3,9 +3,9 @@ import { DataSource } from './DataSource';
 import { ConfigEditor } from './ConfigEditor';
 import { QueryEditor } from './QueryEditor';
 import { VariableQueryEditor } from './VariableQueryEditor';
-import { JsonApiQuery, MyDataSourceOptions } from './types';
+import { JsonApiQuery, JsonApiDataSourceOptions } from './types';
 
-export const plugin = new DataSourcePlugin<DataSource, JsonApiQuery, MyDataSourceOptions>(DataSource)
+export const plugin = new DataSourcePlugin<DataSource, JsonApiQuery, JsonApiDataSourceOptions>(DataSource)
   .setConfigEditor(ConfigEditor)
   .setQueryEditor(QueryEditor)
   .setVariableQueryEditor(VariableQueryEditor);

src/types.ts

@@ -10,7 +10,7 @@ export interface JsonApiQuery extends DataQuery {
   cacheDurationSeconds: number;
 }
 
-export interface MyVariableQuery extends DataQuery {
+export interface JsonApiVariableQuery extends DataQuery {
   jsonPath: string;
 }
 
@@ -19,8 +19,8 @@ export const defaultQuery: Partial<JsonApiQuery> = {
   cacheDurationSeconds: 300,
 };
 
-export interface MyDataSourceOptions extends DataSourceJsonData {
+export interface JsonApiDataSourceOptions extends DataSourceJsonData {
   queryParams?: string;
 }
 
-export interface MySecureJsonData {}
+export interface JsonApiSecureJsonData {}