Remove visTypeVega from visAugmenter reqd plugins; other minor cleanup

Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>
ohltyler · Mar 29, 2023 · 4fa4d70 · 4fa4d70
1 parent 9c2e349
commit 4fa4d70
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 36 deletions.
diff --git a/src/plugins/vis_augmenter/opensearch_dashboards.json b/src/plugins/vis_augmenter/opensearch_dashboards.json
@@ -3,11 +3,5 @@
   "version": "opensearchDashboards",
   "server": true,
   "ui": true,
-  "requiredPlugins": [
-    "data",
-    "savedObjects",
-    "opensearchDashboardsUtils",
-    "expressions",
-    "visTypeVega"
-  ]
+  "requiredPlugins": ["data", "savedObjects", "opensearchDashboardsUtils", "expressions"]
 }
diff --git a/src/plugins/vis_augmenter/public/constants.ts b/src/plugins/vis_augmenter/public/constants.ts
@@ -4,6 +4,7 @@
  */
 
 export const VIS_LAYER_COLUMN_TYPE = 'vis_layer';
+// TODO: replace with a value imported from OUI
 export const EVENT_COLOR = 'red';
 export const HOVER_PARAM = 'HOVER';
 export const EVENT_MARK_SIZE = 100;

diff --git a/src/plugins/vis_type_vega/public/expressions/index.ts b/src/plugins/vis_type_vega/public/expressions/index.ts
@@ -1,31 +1,6 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
- *
- * Any modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
  */
 
 export { LineVegaSpecExpressionFunctionDefinition } from './line_vega_spec_fn';

diff --git a/src/plugins/vis_type_vega/public/expressions/line_vega_spec_fn.ts b/src/plugins/vis_type_vega/public/expressions/line_vega_spec_fn.ts
@@ -69,9 +69,7 @@ export const createLineVegaSpecFn = (
 
     const visParams = JSON.parse(args.visParams) as VisParams;
     const dimensions = JSON.parse(args.dimensions) as VislibDimensions;
-    const allVisLayers = (args.visLayers
-      ? (JSON.parse(args.visLayers) as VisLayers)
-      : []) as VisLayers;
+    const allVisLayers = (args.visLayers ? JSON.parse(args.visLayers) : []) as VisLayers;
 
     // currently only supporting PointInTimeEventsVisLayer type
     const pointInTimeEventsVisLayers = allVisLayers.filter((visLayer: VisLayer) =>