frontend fix

Author: gurinder39

Diff for: packages/grafana-ui/src/components/Select/Select.tsx

@@ -38,10 +38,6 @@ export function AsyncVirtualizedSelect<T, Rest = {}>(props: VirtualizedSelectAsy
   return <SelectBase virtualized {...props} />;
 }
 
-export function AsyncVirtualizedSelect<T>(props: VirtualizedSelectAsyncProps<T>) {
-  return <SelectBase virtualized {...props} />;
-}
-
 interface AsyncMultiSelectProps<T> extends Omit<MultiSelectCommonProps<T>, 'options'>, SelectAsyncProps<T> {
   // AsyncSelect has options stored internally. We cannot enable plain values as we don't have access to the fetched options
   value?: Array<SelectableValue<T>>;

Diff for: public/app/features/explore/TraceView/components/utils/color-generator.tsx

@@ -138,10 +138,7 @@ export function getFilteredColors(colorsHex: string[], theme: GrafanaTheme2) {
   if (redIndex > -1) {
     filtered.splice(redIndex, 1);
   }
-  const redIndex2 = colorsHex.indexOf('#BF1B00');
-  if (redIndex2 > -1) {
-    filtered.splice(redIndex2, 1);
-  }
+
   const redIndex2 = colorsHex.indexOf('#BF1B00');
   if (redIndex2 > -1) {
     colorsHex.splice(redIndex2, 1);

Diff for: public/app/plugins/datasource/fifemon-graphql-datasource/FN_DataSource.ts

@@ -1,6 +1,4 @@
-import _ from 'lodash';
-import { isEqual } from 'lodash';
-import defaults from 'lodash/defaults';
+import { isEqual, defaults, isNumber } from 'lodash';
 
 import {
   AnnotationEvent,
@@ -11,8 +9,11 @@ import {
   DataSourceInstanceSettings,
   ScopedVars,
   TimeRange,
+  MutableDataFrame,
+  dateTime,
+  DataFrame,
+  FieldType,
 } from '@grafana/data';
-import { dateTime, MutableDataFrame, FieldType, DataFrame } from '@grafana/data';
 import { getTemplateSrv, DataSourceWithBackend } from '@grafana/runtime';
 import { BackendSrv, getBackendSrv } from 'app/core/services/backend_srv';
 
@@ -42,6 +43,7 @@ export class FN_DataSource extends DataSourceWithBackend<MyQuery, MyDataSourceOp
     this.withCredentials = instanceSettings.withCredentials;
 
     console.log({ instanceSettings });
+    // @ts-ignore
     const url = instanceSettings.jsonData['connection.url'];
     // const url = "http://localhost:8081/api/query"
     this.url = url;
@@ -147,6 +149,7 @@ export class FN_DataSource extends DataSourceWithBackend<MyQuery, MyDataSourceOp
     return dataPathArray;
   }
 
+  // @ts-ignore
   async query(options: DataQueryRequest<MyQuery>): Promise<DataQueryResponse> {
     return Promise.all(
       options.targets.map((target) => {
@@ -190,7 +193,7 @@ export class FN_DataSource extends DataSourceWithBackend<MyQuery, MyDataSourceOp
                 let t: FieldType = FieldType.string;
                 if (fieldName === timePath || isRFC3339_ISO6801(String(doc[fieldName]))) {
                   t = FieldType.time;
-                } else if (_.isNumber(doc[fieldName])) {
+                } else if (isNumber(doc[fieldName])) {
                   t = FieldType.number;
                 }
                 let title;
@@ -215,6 +218,7 @@ export class FN_DataSource extends DataSourceWithBackend<MyQuery, MyDataSourceOp
                   name: fieldName,
                   type: t,
                   config: { displayName: title },
+                  // @ts-ignore
                 }).parse = (v: any) => {
                   return v || '';
                 };
@@ -234,6 +238,7 @@ export class FN_DataSource extends DataSourceWithBackend<MyQuery, MyDataSourceOp
   }
   annotationQuery(options: AnnotationQueryRequest<MyQuery>): Promise<AnnotationEvent[]> {
     const query = defaults(options.annotation, defaultQuery);
+    // @ts-ignore
     return Promise.all([this.createQuery(query, options.range)]).then((results: any) => {
       const r: AnnotationEvent[] = [];
       for (const res of results) {
@@ -257,15 +262,15 @@ export class FN_DataSource extends DataSourceWithBackend<MyQuery, MyDataSourceOp
               const fieldValue = doc[fieldName];
               const replaceKey = 'field_' + fieldName;
               const regex = new RegExp('\\$' + replaceKey, 'g');
-              title = title.replace(regex, fieldValue);
-              text = text.replace(regex, fieldValue);
-              tags = tags.replace(regex, fieldValue);
+              title = title?.replace(regex, fieldValue);
+              text = text?.replace(regex, fieldValue);
+              tags = tags?.replace(regex, fieldValue);
             }
 
             annotation.title = title;
             annotation.text = text;
             const tagsList: string[] = [];
-            for (const element of tags.split(',')) {
+            for (const element of (tags || '').split(',')) {
               const trimmed = element.trim();
               if (trimmed) {
                 tagsList.push(trimmed);

Diff for: public/microfrontends/fn_dashboard/index.html

@@ -21,13 +21,13 @@
 
     <script
       nonce=""
-      src="../../../public/build/runtime~fn_dashboard.375a91acb85697a4dbda.js"
+      src="../../../public/build/runtime~fn_dashboard.0b5ba2b612e02a26515d.js"
       type="text/javascript"
     ></script>
 
     <script
       nonce=""
-      src="../../../public/build/fn_dashboard.cd8cde89e698ef2786eb.js"
+      src="../../../public/build/fn_dashboard.742c500e788f62df8c85.js"
       type="text/javascript"
     ></script>
 

Diff for: public/test/mocks/datasource_srv.ts

@@ -70,12 +70,6 @@ export class MockDataSourceApi extends DataSourceApi {
     this.meta.mixed = value;
     return this;
   }
-
-  setupMixed(value: boolean) {
-    this.meta = this.meta || {};
-    this.meta.mixed = value;
-    return this;
-  }
 }
 
 export class MockObservableDataSourceApi extends DataSourceApi {