Fix imports after rebasing

Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>
opensearch-project · Dec 30, 2022 · 9a3bc42 · 9a3bc42
1 parent 2807e44
commit 9a3bc42
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/src/plugins/vis_augmenter/public/plugin.ts b/src/plugins/vis_augmenter/public/plugin.ts
@@ -6,12 +6,9 @@
 import { ExpressionsSetup } from '../../expressions/public';
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
 import { DataPublicPluginSetup, DataPublicPluginStart } from '../../data/public';
-<<<<<<< HEAD
 import { visLayers } from './expressions';
-=======
 import { setSavedAugmentVisLoader } from './services';
 import { createSavedAugmentVisLoader, SavedAugmentVisLoader } from './saved_augment_vis';
->>>>>>> c3e46d9dc9 (Add augment-vis saved obj)
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface VisAugmenterSetup {}

diff --git a/src/plugins/vis_augmenter/public/saved_augment_vis/saved_augment_vis.test.ts b/src/plugins/vis_augmenter/public/saved_augment_vis/saved_augment_vis.test.ts
@@ -4,6 +4,7 @@
  */
 
 import { VisLayerExpressionFn } from '../types';
+import { VisLayerTypes } from '../../common';
 import {
   createSavedAugmentVisLoader,
   SavedObjectOpenSearchDashboardsServicesWithAugmentVis,
@@ -12,8 +13,7 @@ import { generateAugmentVisSavedObject, getMockAugmentVisSavedObjectClient } fro
 
 describe('SavedObjectLoaderAugmentVis', () => {
   const fn = {
-    // TODO: VisLayerTypes will resolve after rebasing with earlier PR
-    type: VisLayerTypes.PointInTimeEventsLayer,
+    type: VisLayerTypes.PointInTimeEvents,
     name: 'test-fn',
     args: {
       testArg: 'test-value',

diff --git a/src/plugins/vis_augmenter/public/saved_augment_vis/saved_augment_vis.ts b/src/plugins/vis_augmenter/public/saved_augment_vis/saved_augment_vis.ts
@@ -9,6 +9,7 @@ import {
   SavedObjectOpenSearchDashboardsServices,
 } from '../../../saved_objects/public';
 import { createSavedAugmentVisClass } from './_saved_augment_vis';
+import { VisLayerTypes } from '../../common';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface SavedObjectOpenSearchDashboardsServicesWithAugmentVis
@@ -30,7 +31,6 @@ export function createSavedAugmentVisLoader(
       if (isEmpty(source.visLayerExpressionFn)) {
         source.error = 'visLayerExpressionFn is missing in augment-vis saved object';
       }
-      // TODO: will resolve after rebasing with earlier PR
       if (!(get(source, 'visLayerExpressionFn.type', '') in VisLayerTypes)) {
         source.error = 'Unknown VisLayer expression function type';
       }

diff --git a/src/plugins/vis_augmenter/public/saved_augment_vis/utils/test_helpers.ts b/src/plugins/vis_augmenter/public/saved_augment_vis/utils/test_helpers.ts
@@ -3,17 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { isEmpty } from 'lodash';
-import { SavedObjectsClientContract } from 'opensearch-dashboards/public';
-import { getSavedAugmentVisLoader } from '../../services';
-import { ISavedAugmentVis } from '../../../common';
-import { VisLayerExpressionFn } from '../../types';
+import { VisLayerTypes } from '../../../common';
+import { VisLayerExpressionFn, ISavedAugmentVis } from '../../types';
 
 const id = 'test-id';
 const pluginResourceId = 'test-plugin-resource-id';
 const visLayerExpressionFn = {
-  // TODO: VisLayerTypes will resolve after rebasing with earlier PR
-  type: VisLayerTypes.PointInTimeEventsLayer,
+  type: VisLayerTypes.PointInTimeEvents,
   name: 'test-fn',
   args: {
     testArg: 'test-value',

diff --git a/src/plugins/vis_augmenter/public/types.ts b/src/plugins/vis_augmenter/public/types.ts
@@ -4,6 +4,7 @@
  */
 
 import { SavedObject } from '../../saved_objects/public';
+import { VisLayerTypes } from '../common';
 
 export interface ISavedAugmentVis {
   id?: string;
@@ -16,7 +17,6 @@ export interface ISavedAugmentVis {
 }
 
 export interface VisLayerExpressionFn {
-  // TODO: VisLayerTypes will resolve after rebasing with earlier PR
   type: keyof typeof VisLayerTypes;
   name: string;
   // plugin expression fns can freely set custom arguments