refactor(system, data-frame): change term 'Metadata' to 'Properties'

src/core/types.ts

@@ -1,4 +1,6 @@
-import { SystemMetadata } from "../datasources/system/types";
+import { SystemProperties } from "../datasources/system/types";
+
+export const LEGACY_METADATA_TYPE = 'Metadata';
 
 export interface Workspace {
   id: string,
@@ -16,7 +18,7 @@ export interface QuerySystemsRequest {
 }
 
 export interface QuerySystemsResponse {
-  data: SystemMetadata[]
+  data: SystemProperties[]
   count: number
 }
 

src/datasources/asset/components/AssetQueryEditor.test.ts

@@ -1,5 +1,5 @@
 import { screen, waitFor } from '@testing-library/react';
-import { SystemMetadata } from '../../system/types';
+import { SystemProperties } from '../../system/types';
 import { AssetDataSource } from '../AssetDataSource';
 import { setupRenderer } from '../../../test/fixtures';
 import { CalibrationForecastDataSource } from '../data-sources/calibration-forecast/CalibrationForecastDataSource';
@@ -12,7 +12,7 @@ import { AssetFeatureTogglesDefaults, AssetQueryType } from '../types/types';
 import { ListAssetsDataSource } from '../data-sources/list-assets/ListAssetsDataSource';
 import { AssetSummaryDataSource } from '../data-sources/asset-summary/AssetSummaryDataSource';
 
-const fakeSystems: SystemMetadata[] = [
+const fakeSystems: SystemProperties[] = [
     {
         id: '1',
         state: 'CONNECTED',
@@ -30,7 +30,7 @@ let assetDatasourceOptions = {
 }
 
 class FakeAssetsSource extends ListAssetsDataSource {
-    querySystems(filter?: string, projection?: string[]): Promise<SystemMetadata[]> {
+    querySystems(filter?: string, projection?: string[]): Promise<SystemProperties[]> {
         return Promise.resolve(fakeSystems);
     }
 }

src/datasources/asset/components/editors/calibration-forecast/CalibrationForecastEditor.tsx

@@ -9,7 +9,7 @@ import {
 import _ from 'lodash';
 import { SelectableValue, toOption } from '@grafana/data';
 import { Workspace } from '../../../../../core/types';
-import { SystemMetadata } from '../../../../system/types';
+import { SystemProperties } from '../../../../system/types';
 import { InlineField, MultiSelect } from '@grafana/ui';
 import { FloatingError } from '../../../../../core/errors';
 import { enumToOptions } from '../../../../../core/utils';
@@ -25,7 +25,7 @@ type Props = {
 export function CalibrationForecastEditor({ query, handleQueryChange, datasource }: Props) {
   query = datasource.prepareQuery(query) as CalibrationForecastQuery;
   const [workspaces, setWorkspaces] = useState<Workspace[]>([]);
-  const [systems, setSystems] = useState<SystemMetadata[]>([]);
+  const [systems, setSystems] = useState<SystemProperties[]>([]);
   const [areDependenciesLoaded, setAreDependenciesLoaded] = useState<boolean>(false);
 
   useEffect(() => {

src/datasources/asset/components/editors/calibration-forecast/query-builder/CalibrationForecastQueryBuilder.test.tsx

@@ -2,17 +2,17 @@ import React, { ReactNode } from "react";
 import { CalibrationForecastQueryBuilder } from "./CalibrationForecastQueryBuilder";
 import { render } from "@testing-library/react";
 import { QueryBuilderOption, Workspace } from "core/types";
-import { SystemMetadata } from "datasources/system/types";
+import { SystemProperties } from "datasources/system/types";
 
 describe('CalibrationForecastQueryBuilder', () => {
   describe('useEffects', () => {
     let reactNode: ReactNode
 
     const containerClass = 'smart-filter-group-condition-container';
     const workspace = { id: '1', name: 'Selected workspace' } as Workspace;
-    const system = { id: '1', alias: 'Selected system' } as SystemMetadata;
+    const system = { id: '1', alias: 'Selected system' } as SystemProperties;
 
-    function renderElement(workspaces: Workspace[], systems: SystemMetadata[], filter?: string, globalVariableOptions: QueryBuilderOption[] = []) {
+    function renderElement(workspaces: Workspace[], systems: SystemProperties[], filter?: string, globalVariableOptions: QueryBuilderOption[] = []) {
       reactNode = React.createElement(CalibrationForecastQueryBuilder, { workspaces, systems, filter, globalVariableOptions, onChange: jest.fn(), areDependenciesLoaded: true });
       const renderResult = render(reactNode);
       return {

src/datasources/asset/components/editors/calibration-forecast/query-builder/CalibrationForecastQueryBuilder.tsx

@@ -11,7 +11,7 @@ import 'smart-webcomponents-react/source/styles/components/smart.querybuilder.cs
 import { Workspace, QueryBuilderOption } from 'core/types';
 import { queryBuilderMessages, QueryBuilderOperations } from 'core/query-builder.constants';
 import { expressionBuilderCallback, expressionReaderCallback } from 'core/query-builder.utils';
-import { SystemMetadata } from 'datasources/system/types';
+import { SystemProperties } from 'datasources/system/types';
 import { QBField } from '../../../../types/CalibrationForecastQuery.types';
 import { AssetCalibrationFields, AssetCalibrationStaticFields } from '../../../../constants/CalibrationForecastQuery.constants';
 import { filterXSSField, filterXSSLINQExpression } from 'core/utils';
@@ -20,7 +20,7 @@ type CalibrationForecastQueryBuilderProps = QueryBuilderProps &
   React.HTMLAttributes<Element> & {
     filter?: string;
     workspaces: Workspace[];
-    systems: SystemMetadata[];
+    systems: SystemProperties[];
     globalVariableOptions: QueryBuilderOption[];
     areDependenciesLoaded: boolean;
   };

src/datasources/asset/components/editors/list-assets/ListAssetsEditor.test.tsx

@@ -1,13 +1,13 @@
 import { screen, waitFor } from '@testing-library/react';
-import { SystemMetadata } from '../../../../system/types';
+import { SystemProperties } from '../../../../system/types';
 import { AssetDataSource } from '../../../AssetDataSource';
 import { AssetQueryEditor } from '../../AssetQueryEditor';
 import { setupRenderer } from '../../../../../test/fixtures';
 import { ListAssetsQuery } from '../../../types/ListAssets.types';
 import { AssetFeatureTogglesDefaults } from 'datasources/asset/types/types';
 import { ListAssetsDataSource } from '../../../data-sources/list-assets/ListAssetsDataSource';
 
-const fakeSystems: SystemMetadata[] = [
+const fakeSystems: SystemProperties[] = [
   {
     id: '1',
     state: 'CONNECTED',
@@ -25,7 +25,7 @@ let assetDatasourceOptions = {
 }
 
 class FakeAssetsSource extends ListAssetsDataSource {
-  querySystems(filter?: string, projection?: string[]): Promise<SystemMetadata[]> {
+  querySystems(filter?: string, projection?: string[]): Promise<SystemProperties[]> {
     return Promise.resolve(fakeSystems);
   }
 }

src/datasources/asset/components/editors/list-assets/ListAssetsEditor.tsx

@@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react';
 import { InlineField } from '@grafana/ui';
 import _ from 'lodash';
 import { FloatingError } from '../../../../../core/errors';
-import { SystemMetadata } from '../../../../system/types';
+import { SystemProperties } from '../../../../system/types';
 import { AssetQuery } from '../../../types/types';
 import { ListAssetsQuery } from '../../../types/ListAssets.types';
 import { AssetQueryBuilder } from './query-builder/AssetQueryBuilder';
@@ -18,7 +18,7 @@ type Props = {
 
 export function ListAssetsEditor({ query, handleQueryChange, datasource }: Props) {
   const [workspaces, setWorkspaces] = useState<Workspace[]>([]);
-  const [systems, setSystems] = useState<SystemMetadata[]>([]);
+  const [systems, setSystems] = useState<SystemProperties[]>([]);
   const [areDependenciesLoaded, setAreDependenciesLoaded] = useState<boolean>(false);
 
   useEffect(() => {

src/datasources/asset/components/editors/list-assets/query-builder/AssetQueryBuilder.test.tsx

@@ -2,15 +2,15 @@ import React, { ReactNode } from 'react';
 import { AssetQueryBuilder } from './AssetQueryBuilder';
 import { render } from '@testing-library/react';
 import { QueryBuilderOption, Workspace } from 'core/types';
-import { SystemMetadata } from 'datasources/system/types';
+import { SystemProperties } from 'datasources/system/types';
 
 describe('AssetQueryBuilder', () => {
   describe('useEffects', () => {
     let reactNode: ReactNode;
 
     const containerClass = 'smart-filter-group-condition-container';
 
-    function renderElement(workspaces: Workspace[], systems: SystemMetadata[], filter?: string, globalVariableOptions: QueryBuilderOption[] = []) {
+    function renderElement(workspaces: Workspace[], systems: SystemProperties[], filter?: string, globalVariableOptions: QueryBuilderOption[] = []) {
       reactNode = React.createElement(AssetQueryBuilder, {
         workspaces,
         systems,
@@ -34,7 +34,7 @@ describe('AssetQueryBuilder', () => {
 
     it('should select workspace in query builder', () => {
       const workspace = { id: '1', name: 'Selected workspace' } as Workspace;
-      const system = { id: '1', alias: 'Selected system' } as SystemMetadata;
+      const system = { id: '1', alias: 'Selected system' } as SystemProperties;
       const { conditionsContainer } = renderElement([workspace], [system], 'Workspace = "1"');
 
       expect(conditionsContainer?.length).toBe(1);
@@ -43,7 +43,7 @@ describe('AssetQueryBuilder', () => {
 
     it('should select system in query builder', () => {
       const workspace = { id: '1', name: 'Selected workspace' } as Workspace;
-      const system = { id: '1', alias: 'Selected system' } as SystemMetadata;
+      const system = { id: '1', alias: 'Selected system' } as SystemProperties;
 
       const { conditionsContainer } = renderElement([workspace], [system], 'Location = "1"');
 
@@ -53,7 +53,7 @@ describe('AssetQueryBuilder', () => {
 
     it('should select global variable option', () => {
       const workspace = { id: '1', name: 'Selected workspace' } as Workspace;
-      const system = { id: '1', alias: 'Selected system' } as SystemMetadata;
+      const system = { id: '1', alias: 'Selected system' } as SystemProperties;
       const globalVariableOption = { label: 'Global variable', value: 'global_variable' };
 
       const { conditionsContainer } = renderElement([workspace], [system], 'AssetType = \"global_variable\"', [globalVariableOption]);
@@ -65,7 +65,7 @@ describe('AssetQueryBuilder', () => {
     [['${__from:date}', 'From'], ['${__to:date}', 'To'], ['${__now:date}', 'Now']].forEach(([value, label]) => {
       it(`should select user friendly value for calibration due date`, () => {
         const workspace = { id: '1', name: 'Selected workspace' } as Workspace;
-        const system = { id: '1', alias: 'Selected system' } as SystemMetadata;
+        const system = { id: '1', alias: 'Selected system' } as SystemProperties;
 
         const { conditionsContainer } = renderElement([workspace], [system], `ExternalCalibration.NextRecommendedDate > \"${value}\"`);
 
@@ -76,7 +76,7 @@ describe('AssetQueryBuilder', () => {
 
     it('should select a sanitized Workspace in query builder', () => {
       const workspace = { id: '1', name: 'Selected workspace' } as Workspace;
-      const system = { id: '1', alias: 'Selected system' } as SystemMetadata;
+      const system = { id: '1', alias: 'Selected system' } as SystemProperties;
       const { conditionsContainer } = renderElement([workspace], [system], 'Workspace = "<script>alert(\'Workspace\')</script>"');
 
       expect(conditionsContainer?.length).toBe(1);

src/datasources/asset/components/editors/list-assets/query-builder/AssetQueryBuilder.tsx

@@ -11,7 +11,7 @@ import 'smart-webcomponents-react/source/styles/components/smart.querybuilder.cs
 import { Workspace, QueryBuilderOption } from 'core/types';
 import { queryBuilderMessages, QueryBuilderOperations } from 'core/query-builder.constants';
 import { expressionBuilderCallback, expressionReaderCallback } from 'core/query-builder.utils';
-import { SystemMetadata } from 'datasources/system/types';
+import { SystemProperties } from 'datasources/system/types';
 import { QBField } from '../../../../types/CalibrationForecastQuery.types';
 import { ListAssetsFields, ListAssetsStaticFields } from '../../../../constants/ListAssets.constants';
 import { filterXSSField, filterXSSLINQExpression } from 'core/utils';
@@ -20,7 +20,7 @@ type AssetCalibrationQueryBuilderProps = QueryBuilderProps &
   React.HTMLAttributes<Element> & {
     filter?: string;
     workspaces: Workspace[];
-    systems: SystemMetadata[];
+    systems: SystemProperties[];
     globalVariableOptions: QueryBuilderOption[];
     areDependenciesLoaded: boolean;
   };

src/datasources/asset/components/variable-editor/AssetVariableQueryEditor.test.tsx

@@ -1,13 +1,13 @@
 import { screen, waitFor } from '@testing-library/react';
 import { AssetQuery, AssetQueryType } from '../../types/types';
-import { SystemMetadata } from '../../../system/types'
+import { SystemProperties } from '../../../system/types'
 import { AssetVariableQueryEditor } from './AssetVariableQueryEditor';
 import { Workspace } from 'core/types';
 import { setupRenderer } from 'test/fixtures';
 import { ListAssetsDataSource } from '../../data-sources/list-assets/ListAssetsDataSource';
 import { AssetDataSource } from 'datasources/asset/AssetDataSource';
 
-const fakeSystems: SystemMetadata[] = [
+const fakeSystems: SystemProperties[] = [
     {
         id: '1',
         state: 'CONNECTED',
@@ -39,7 +39,7 @@ class FakeAssetsSource extends ListAssetsDataSource {
     getWorkspaces(): Promise<Workspace[]> {
         return Promise.resolve(fakeWorkspaces);
     }
-    querySystems(filter?: string, projection?: string[]): Promise<SystemMetadata[]> {
+    querySystems(filter?: string, projection?: string[]): Promise<SystemProperties[]> {
         return Promise.resolve(fakeSystems);
     }
 }

src/datasources/asset/components/variable-editor/AssetVariableQueryEditor.tsx

@@ -5,14 +5,14 @@ import { AssetDataSource } from '../../AssetDataSource'
 import { FloatingError } from '../../../../core/errors';
 import { AssetQueryBuilder } from '../editors/list-assets/query-builder/AssetQueryBuilder';
 import { Workspace } from '../../../../core/types';
-import { SystemMetadata } from '../../../system/types';
+import { SystemProperties } from '../../../system/types';
 import { AssetVariableQuery } from '../../../asset/types/AssetVariableQuery.types';
 
 type Props = QueryEditorProps<AssetDataSource, AssetQuery, AssetDataSourceOptions>;
 
 export function AssetVariableQueryEditor({ datasource, query, onChange }: Props) {
   const [workspaces, setWorkspaces] = useState<Workspace[]>([]);
-  const [systems, setSystems] = useState<SystemMetadata[]>([]);
+  const [systems, setSystems] = useState<SystemProperties[]>([]);
   const [areDependenciesLoaded, setAreDependenciesLoaded] = useState<boolean>(false);
   const assetVariableQuery = query as AssetVariableQuery;
   const assetListDatasource = useRef(datasource.getListAssetsSource());

src/datasources/asset/data-sources/AssetDataSourceBase.ts

@@ -2,7 +2,7 @@ import { DataFrameDTO, DataQueryRequest, TestDataSourceResponse } from "@grafana
 import { AssetDataSourceOptions, AssetQuery } from "../types/types";
 import { DataSourceBase } from "../../../core/DataSourceBase";
 import { defaultOrderBy, defaultProjection } from "../../system/constants";
-import { SystemMetadata } from "../../system/types";
+import { SystemProperties } from "../../system/types";
 import { parseErrorMessage } from "../../../core/errors";
 import { QueryBuilderOption, Workspace } from "../../../core/types";
 import { ExpressionTransformFunction } from "../../../core/query-builder.utils";
@@ -19,7 +19,7 @@ export abstract class AssetDataSourceBase extends DataSourceBase<AssetQuery, Ass
 
   public error = '';
 
-  public readonly systemAliasCache = new Map<string, SystemMetadata>([]);
+  public readonly systemAliasCache = new Map<string, SystemProperties>([]);
   public readonly workspacesCache = new Map<string, Workspace>([]);
 
 
@@ -31,7 +31,7 @@ export abstract class AssetDataSourceBase extends DataSourceBase<AssetQuery, Ass
     throw new Error("Method not implemented.");
   }
 
-  public async querySystems(filter = '', projection = defaultProjection): Promise<SystemMetadata[]> {
+  public async querySystems(filter = '', projection = defaultProjection): Promise<SystemProperties[]> {
     try {
       let response = await this.getSystems({
         filter: filter,
@@ -45,7 +45,7 @@ export abstract class AssetDataSourceBase extends DataSourceBase<AssetQuery, Ass
     }
   }
 
-  public getCachedSystems(): SystemMetadata[] {
+  public getCachedSystems(): SystemProperties[] {
     return Array.from(this.systemAliasCache.values());
   }
 

src/datasources/asset/data-sources/calibration-forecast/CalibrationForecastDataSource.test.ts

@@ -7,7 +7,7 @@ import {
   requestMatching,
   setupDataSource,
 } from "test/fixtures";
-import { SystemMetadata } from "datasources/system/types";
+import { SystemProperties } from "datasources/system/types";
 import { dateTime } from "@grafana/data";
 import { AssetCalibrationForecastKey, AssetCalibrationPropertyGroupByType, AssetCalibrationTimeBasedGroupByType, CalibrationForecastQuery, CalibrationForecastResponse, ColumnDescriptorType } from "../../types/CalibrationForecastQuery.types";
 import { CalibrationForecastDataSource } from "./CalibrationForecastDataSource";
@@ -311,7 +311,7 @@ const buildCalibrationForecastQuery = getQueryBuilder<CalibrationForecastQuery>(
   groupBy: []
 });
 
-const fakeSystems: SystemMetadata[] = [
+const fakeSystems: SystemProperties[] = [
   {
     id: 'Minion1',
     alias: 'Minion1-alias',