Chore: Rename datasource file

.github/workflows/e2e.yml

@@ -57,8 +57,8 @@ jobs:
 
       - name: Start Grafana
         run: |
-          docker-compose pull
-          GRAFANA_VERSION=${{ matrix.GRAFANA_IMAGE.VERSION }} GRAFANA_IMAGE=${{ matrix.GRAFANA_IMAGE.NAME }} docker-compose up -d
+          docker compose pull
+          GRAFANA_VERSION=${{ matrix.GRAFANA_IMAGE.VERSION }} GRAFANA_IMAGE=${{ matrix.GRAFANA_IMAGE.NAME }} docker compose up -d
 
       - name: Wait for Grafana to start
         uses: nev7n/wait_for_response@v1

cspell.config.json

@@ -70,6 +70,7 @@
     "eslintcache",
     "lefthook",
     "ssjagad",
-    "jackspeak"
+    "jackspeak", 
+    "nvmrc"
   ]
 }

src/DataSource.test.ts → src/SitewiseDataSource.test.ts

@@ -1,4 +1,4 @@
-import { DataSource } from './DataSource';
+import { DataSource } from './SitewiseDataSource';
 import { DataSourceInstanceSettings, PluginMeta, ScopedVar, ScopedVars } from '@grafana/data';
 import { QueryType, SitewiseOptions, SitewiseQuery } from './types';
 

src/components/MetaInspector.tsx

@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 import { MetadataInspectorProps, DataFrame } from '@grafana/data';
-import { DataSource } from '../DataSource';
+import { DataSource } from '../SitewiseDataSource';
 import { SitewiseQuery, SitewiseOptions, SitewiseCustomMeta } from '../types';
 import { Tag } from '@grafana/ui';
 

src/components/browser/AssetBrowser.tsx

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { Button, Icon, Modal, Spinner, Tab, TabContent, TabsBar } from '@grafana/ui';
 import { AssetInfo } from '../../types';
-import { DataSource } from 'DataSource';
+import { DataSource } from 'SitewiseDataSource';
 import { SitewiseCache } from 'sitewiseCache';
 import { BrowseModels } from './BrowseModels';
 import { BrowseHierarchy } from './BrowseHierarchy';

src/components/query/QueryEditor.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import { DataQueryRequest, DataSourceInstanceSettings, QueryEditorProps } from '@grafana/data';
-import { DataSource } from 'DataSource';
+import { DataSource } from 'SitewiseDataSource';
 import { QueryType, SitewiseOptions, SitewiseQuery } from 'types';
 import { QueryEditor } from './QueryEditor';
 import { of } from 'rxjs';

src/components/query/QueryEditor.tsx

@@ -1,7 +1,7 @@
 import defaults from 'lodash/defaults';
 import React from 'react';
 import { QueryEditorProps, SelectableValue } from '@grafana/data';
-import { DataSource } from 'DataSource';
+import { DataSource } from 'SitewiseDataSource';
 import { SitewiseQuery, SitewiseOptions, QueryType, ListAssetsQuery, ListTimeSeriesQuery } from 'types';
 import { Icon, LinkButton, Select } from '@grafana/ui';
 import { QueryTypeInfo, siteWiseQueryTypes, changeQueryType } from 'queryInfo';
@@ -60,8 +60,8 @@ export function QueryEditor(props: Props) {
         return null; // nothing required
       case QueryType.ListAssets:
         return <ListAssetsQueryEditor {...props} query={query as ListAssetsQuery} />;
-        case QueryType.ListTimeSeries:
-        return <ListTimeSeriesQueryEditorFunction {...props} query={query as ListTimeSeriesQuery} />
+      case QueryType.ListTimeSeries:
+        return <ListTimeSeriesQueryEditorFunction {...props} query={query as ListTimeSeriesQuery} />;
       case QueryType.ListAssociatedAssets:
       case QueryType.PropertyValue:
       case QueryType.PropertyInterpolated:

src/components/query/types.ts

@@ -1,4 +1,4 @@
-import { DataSource } from 'DataSource';
+import { DataSource } from 'SitewiseDataSource';
 import { SitewiseQuery } from 'types';
 
 export interface SitewiseQueryEditorProps<TQuery extends SitewiseQuery = SitewiseQuery> {

src/module.ts

@@ -1,5 +1,5 @@
 import { DataSourcePlugin } from '@grafana/data';
-import { DataSource } from './DataSource';
+import { DataSource } from './SitewiseDataSource';
 import { SitewiseQuery, SitewiseOptions } from './types';
 import { MetaInspector } from 'components/MetaInspector';
 import { ConfigEditor } from 'components/ConfigEditor';

src/sitewiseCache.ts

@@ -1,5 +1,5 @@
 import { DataFrameView, SelectableValue } from '@grafana/data';
-import { DataSource } from 'DataSource';
+import { DataSource } from 'SitewiseDataSource';
 import { ListAssetsQuery, ListAssociatedAssetsQuery, QueryType } from 'types';
 import { AssetModelSummary, AssetSummary, DescribeAssetResult } from './queryResponseTypes';
 import { AssetInfo, AssetPropertyInfo } from './types';
@@ -15,10 +15,7 @@ export class SitewiseCache {
   private topLevelAssets?: DataFrameView<AssetSummary>;
   private assetPropertiesByAssetId = new Map<string, DataFrameView<{ id: string; name: string }>>();
 
-  constructor(
-    private ds: DataSource,
-    private region: string
-  ) {}
+  constructor(private ds: DataSource, private region: string) {}
 
   async getAssetInfo(id: string): Promise<AssetInfo | undefined> {
     const v = this.assetsById.get(id);

src/variables.ts

@@ -2,7 +2,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { assign } from 'lodash';
 import { QueryType, SitewiseQuery } from './types';
-import { DataSource } from './DataSource';
+import { DataSource } from './SitewiseDataSource';
 import { DataQueryRequest, DataQueryResponse, CustomVariableSupport, DataFrameView } from '@grafana/data';
 import { QueryEditor } from './components/query/QueryEditor';
 import { AssetModelSummary } from 'queryResponseTypes';
@@ -25,28 +25,28 @@ export class SitewiseVariableSupport extends CustomVariableSupport<DataSource, S
       case QueryType.ListAssociatedAssets:
         return this.parseOptions(response);
       default:
-        return response
+        return response;
     }
   }
 
-  parseOptions(response: Observable<DataQueryResponse> ): Observable<DataQueryResponse> {
+  parseOptions(response: Observable<DataQueryResponse>): Observable<DataQueryResponse> {
     return response.pipe(
       map((res) => {
-        let data = []
+        let data = [];
         if (res.data.length) {
-          data = res.data[0]
+          data = res.data[0];
         }
-        return {data: new DataFrameView<AssetModelSummary>(data)};
+        return { data: new DataFrameView<AssetModelSummary>(data) };
       }),
       map((res) => {
-        const newData = res.data.map((m)=>{
+        const newData = res.data.map((m) => {
           return {
-          value: m.id,
-          text: m.name,
-        }})
-        return {data:newData}
+            value: m.id,
+            text: m.name,
+          };
+        });
+        return { data: newData };
       })
-    )
+    );
   }
-
 }