adds commit from 2.2 into 2.x (#42)

Signed-off-by: Shivam Dhar <dhshivam@amazon.com>

src/plugins/custom_import_map/.opensearch_dashboards-plugin-helpers.json

@@ -0,0 +1,10 @@
+{
+    "serverSourcePatterns": [
+      "package.json",
+      "tsconfig.json",
+      "yarn.lock",
+      ".yarnrc",
+      "{lib,public,server,webpackShims,translations,utils,models,test,common}/**/*",
+      "!__tests__"
+    ]
+  }

src/plugins/custom_import_map/opensearch_dashboards.json

@@ -1,7 +1,7 @@
 {
     "id": "customImportMapDashboards",
-    "version": "2.2.0.0",
-    "opensearchDashboardsVersion": "2.2.0",
+    "version": "2.2.1.0",
+    "opensearchDashboardsVersion": "2.2.1",
     "server": true,
     "ui": true,
     "requiredPlugins": ["regionMap", "opensearchDashboardsReact"],

src/plugins/custom_import_map/package.json

@@ -1,6 +1,6 @@
 {
   "name": "customImportMap",
-  "version": "2.2.0.0",
+  "version": "2.2.1.0",
   "license": "Apache-2.0",
   "config": {
     "id": "customImportMapDashboards"

src/plugins/custom_import_map/public/plugin.tsx

@@ -13,20 +13,29 @@ import {
 } from './types';
 import { RegionMapVisualizationDependencies } from '../../../src/plugins/region_map/public';
 import { VectorUploadOptions } from './components/vector_upload_options';
+import { OpenSearchDashboardsContextProvider } from '../../../src/plugins/opensearch_dashboards_react/public';
 
 export class CustomImportMapPlugin
   implements Plugin<CustomImportMapPluginSetup, CustomImportMapPluginStart> {
   public setup(
     core: CoreSetup,
     { regionMap }: AppPluginSetupDependencies
   ): CustomImportMapPluginSetup {
-    regionMap.addOptionTab({
-      name: 'controls',
-      title: i18n.translate('regionMap.mapVis.regionMapEditorConfig.controlTabs.controlsTitle', {
-        defaultMessage: 'Import Vector Map',
-      }),
-      editor: (props: RegionMapVisualizationDependencies) => <VectorUploadOptions {...props} />,
-    });
+    const customSetup = async () => {
+      const [coreStart] = await core.getStartServices();
+      regionMap.addOptionTab({
+        name: 'controls',
+        title: i18n.translate('regionMap.mapVis.regionMapEditorConfig.controlTabs.controlsTitle', {
+          defaultMessage: 'Import Vector Map',
+        }),
+        editor: (props: RegionMapVisualizationDependencies) => (
+          <OpenSearchDashboardsContextProvider services={coreStart}>
+            <VectorUploadOptions {...props} />
+          </OpenSearchDashboardsContextProvider>
+        ),
+      });
+    };
+    customSetup();
 
     // Return methods that should be available to other plugins
     return {};

src/plugins/custom_import_map/tsconfig.json

@@ -48,6 +48,7 @@
       "types": ["node", "jest", "react"]
     },
     "include": [
+      "common/**/*",
       "server/**/*",
       "public/**/*",
       "utils/**/*",