Correct OSD import path for custom-import-map (opensearch-project#88)

* Correct import path for custom-import-map and move plugin to repo root path Signed-off-by: Junqiu Lei <[email protected]>
msfroh · Nov 4, 2022 · 2bc133e · 2bc133e
1 parent 67ec513
commit 2bc133e
Show file tree

Hide file tree

Showing 45 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/unit-tests-workflow-for-customImportMap.yml b/.github/workflows/unit-tests-workflow-for-customImportMap.yml
@@ -59,17 +59,17 @@ jobs:
           echo "Installing yarn ${{ steps.versions_step.outputs.yarn_version }}"
           npm i -g yarn@${{ steps.versions_step.outputs.yarn_version }}
 
-      - name: Move src/plugins/custom_import_map to Plugins Dir
-        run: mv src/ OpenSearch-Dashboards/plugins/
+      - name: Move custom_import_map to Plugins Dir
+        run: mv custom_import_map OpenSearch-Dashboards/plugins/custom_import_map
 
       - name: Bootstrap plugin/opensearch-dashboards
         run: |
-          cd OpenSearch-Dashboards/plugins/src/plugins/custom_import_map
+          cd OpenSearch-Dashboards/plugins/custom_import_map
           yarn osd bootstrap
 
       - name: Run tests with coverage
         run: |
-          cd OpenSearch-Dashboards/plugins/src/plugins/custom_import_map
+          cd OpenSearch-Dashboards/plugins/custom_import_map
           yarn run test:jest --coverage
 
       - name: Uploads coverage

diff --git a/src/plugins/custom_import_map/.babelrc → custom_import_map/.babelrc b/src/plugins/custom_import_map/.babelrc → custom_import_map/.babelrc
diff --git a/src/plugins/custom_import_map/.eslintrc → custom_import_map/.eslintrc b/src/plugins/custom_import_map/.eslintrc → custom_import_map/.eslintrc
diff --git a/src/plugins/custom_import_map/.gitignore → custom_import_map/.gitignore b/src/plugins/custom_import_map/.gitignore → custom_import_map/.gitignore
diff --git a/src/plugins/custom_import_map/.lintstagedrc → custom_import_map/.lintstagedrc b/src/plugins/custom_import_map/.lintstagedrc → custom_import_map/.lintstagedrc
diff --git a/...plugins/custom_import_map/.prettierignore → custom_import_map/.prettierignore b/...plugins/custom_import_map/.prettierignore → custom_import_map/.prettierignore
diff --git a/src/plugins/custom_import_map/.prettierrc → custom_import_map/.prettierrc b/src/plugins/custom_import_map/.prettierrc → custom_import_map/.prettierrc
diff --git a/...plugins/custom_import_map/babel.config.js → custom_import_map/babel.config.js b/...plugins/custom_import_map/babel.config.js → custom_import_map/babel.config.js
diff --git a/...tom_import_map/common/constants/shared.ts → custom_import_map/common/constants/shared.ts b/...tom_import_map/common/constants/shared.ts → custom_import_map/common/constants/shared.ts
diff --git a/...plugins/custom_import_map/common/index.ts → custom_import_map/common/index.ts b/...plugins/custom_import_map/common/index.ts → custom_import_map/common/index.ts
diff --git a/src/plugins/custom_import_map/common/util.ts → custom_import_map/common/util.ts b/src/plugins/custom_import_map/common/util.ts → custom_import_map/common/util.ts
diff --git a/...tom_import_map/opensearch_dashboards.json → custom_import_map/opensearch_dashboards.json b/...tom_import_map/opensearch_dashboards.json → custom_import_map/opensearch_dashboards.json
diff --git a/src/plugins/custom_import_map/package.json → custom_import_map/package.json b/src/plugins/custom_import_map/package.json → custom_import_map/package.json
@@ -3,12 +3,12 @@
   "version": "3.0.0.0",
   "scripts": {
     "build": "yarn plugin-helpers build",
-    "plugin-helpers": "node ../../../../scripts/plugin_helpers",
-    "osd": "node ../../../../scripts/osd",
+    "plugin-helpers": "node ../../scripts/plugin_helpers",
+    "osd": "node ../../scripts/osd",
     "lint": "yarn run lint:es && yarn run lint:style",
-    "lint:es": "node ../../../../scripts/eslint",
-    "lint:style": "node ../../../../scripts/stylelint",
-    "test:jest": "../../../../node_modules/.bin/jest --config ./test/jest.config.js"
+    "lint:es": "node ../../scripts/eslint",
+    "lint:style": "node ../../scripts/stylelint",
+    "test:jest": "../../node_modules/.bin/jest --config ./test/jest.config.js"
   },
   "husky": {
     "hooks": {

diff --git a/...napshots__/show_error_modal.test.tsx.snap → ...napshots__/show_error_modal.test.tsx.snap b/...napshots__/show_error_modal.test.tsx.snap → ...napshots__/show_error_modal.test.tsx.snap
diff --git a/...ots__/vector_upload_options.test.tsx.snap → ...ots__/vector_upload_options.test.tsx.snap b/...ots__/vector_upload_options.test.tsx.snap → ...ots__/vector_upload_options.test.tsx.snap
diff --git a/...blic/components/show_error_modal.test.tsx → ...blic/components/show_error_modal.test.tsx b/...blic/components/show_error_modal.test.tsx → ...blic/components/show_error_modal.test.tsx
diff --git a/...ap/public/components/show_error_modal.tsx → ...ap/public/components/show_error_modal.tsx b/...ap/public/components/show_error_modal.tsx → ...ap/public/components/show_error_modal.tsx
diff --git a/...lic/components/vector_upload_options.scss → ...lic/components/vector_upload_options.scss b/...lic/components/vector_upload_options.scss → ...lic/components/vector_upload_options.scss
diff --git a/...components/vector_upload_options.test.tsx → ...components/vector_upload_options.test.tsx b/...components/vector_upload_options.test.tsx → ...components/vector_upload_options.test.tsx
@@ -10,7 +10,7 @@ import { fireEvent } from '@testing-library/dom';
 import '@testing-library/jest-dom';
 import * as serviceApiCalls from '../services';
 
-jest.mock('../../../../../../src/plugins/opensearch_dashboards_react/public', () => ({
+jest.mock('../../../../src/plugins/opensearch_dashboards_react/public', () => ({
   useOpenSearchDashboards: jest.fn().mockReturnValue({
     services: {
       http: {

diff --git a/...blic/components/vector_upload_options.tsx → ...blic/components/vector_upload_options.tsx b/...blic/components/vector_upload_options.tsx → ...blic/components/vector_upload_options.tsx
@@ -29,8 +29,8 @@ import {
 import {
   toMountPoint,
   useOpenSearchDashboards,
-} from '../../../../../../src/plugins/opensearch_dashboards_react/public';
-import { RegionMapOptionsProps } from '../../../../../../src/plugins/region_map/public';
+} from '../../../../src/plugins/opensearch_dashboards_react/public';
+import { RegionMapOptionsProps } from '../../../../src/plugins/region_map/public';
 
 const VectorUploadOptions = (props: RegionMapOptionsProps) => {
   const opensearchDashboards = useOpenSearchDashboards();

diff --git a/...plugins/custom_import_map/public/index.ts → custom_import_map/public/index.ts b/...plugins/custom_import_map/public/index.ts → custom_import_map/public/index.ts
diff --git a/...ugins/custom_import_map/public/plugin.tsx → custom_import_map/public/plugin.tsx b/...ugins/custom_import_map/public/plugin.tsx → custom_import_map/public/plugin.tsx
@@ -5,13 +5,13 @@
 
 import React from 'react';
 import { i18n } from '@osd/i18n';
-import { CoreSetup, CoreStart, Plugin } from '../../../../../src/core/public';
+import { CoreSetup, CoreStart, Plugin } from '../../../src/core/public';
 import {
   CustomImportMapPluginSetup,
   CustomImportMapPluginStart,
   AppPluginSetupDependencies,
 } from './types';
-import { RegionMapVisualizationDependencies } from '../../../../../src/plugins/region_map/public';
+import { RegionMapVisualizationDependencies } from '../../../src/plugins/region_map/public';
 import { VectorUploadOptions } from './components/vector_upload_options';
 
 export class CustomImportMapPlugin

diff --git a/...gins/custom_import_map/public/services.ts → custom_import_map/public/services.ts b/...gins/custom_import_map/public/services.ts → custom_import_map/public/services.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { CoreStart } from '../../../../../src/core/public';
+import { CoreStart } from '../../../src/core/public';
 
 export const postGeojson = async (requestBody: any, http: CoreStart['http']) => {
   try {

diff --git a/...plugins/custom_import_map/public/types.ts → custom_import_map/public/types.ts b/...plugins/custom_import_map/public/types.ts → custom_import_map/public/types.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { NavigationPublicPluginStart } from '../../../../../src/plugins/navigation/public';
-import { RegionMapPluginSetup } from '../../../../../src/plugins/region_map/public';
+import { NavigationPublicPluginStart } from '../../../src/plugins/navigation/public';
+import { RegionMapPluginSetup } from '../../../src/plugins/region_map/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface CustomImportMapPluginSetup {}

diff --git a/...map/server/clusters/geospatial_cluster.js → ...map/server/clusters/geospatial_cluster.js b/...map/server/clusters/geospatial_cluster.js → ...map/server/clusters/geospatial_cluster.js
diff --git a/..._map/server/clusters/geospatial_plugin.ts → ..._map/server/clusters/geospatial_plugin.ts b/..._map/server/clusters/geospatial_plugin.ts → ..._map/server/clusters/geospatial_plugin.ts
diff --git a/...ustom_import_map/server/clusters/index.ts → custom_import_map/server/clusters/index.ts b/...ustom_import_map/server/clusters/index.ts → custom_import_map/server/clusters/index.ts
diff --git a/...plugins/custom_import_map/server/index.ts → custom_import_map/server/index.ts b/...plugins/custom_import_map/server/index.ts → custom_import_map/server/index.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { PluginInitializerContext } from '../../../../../src/core/server';
+import { PluginInitializerContext } from '../../../src/core/server';
 import { CustomImportMapPlugin } from './plugin';
 
 // This exports static code and TypeScript types,

diff --git a/...lugins/custom_import_map/server/plugin.ts → custom_import_map/server/plugin.ts b/...lugins/custom_import_map/server/plugin.ts → custom_import_map/server/plugin.ts
@@ -10,7 +10,7 @@ import {
   CoreStart,
   Plugin,
   Logger,
-} from '../../../../../src/core/server';
+} from '../../../src/core/server';
 
 import { CustomImportMapPluginSetup, CustomImportMapPluginStart } from './types';
 import { createGeospatialCluster } from './clusters';

diff --git a/...om_import_map/server/routes/geospatial.ts → ...om_import_map/server/routes/geospatial.ts b/...om_import_map/server/routes/geospatial.ts → ...om_import_map/server/routes/geospatial.ts
diff --git a/.../custom_import_map/server/routes/index.ts → custom_import_map/server/routes/index.ts b/.../custom_import_map/server/routes/index.ts → custom_import_map/server/routes/index.ts
diff --git a/...om_import_map/server/routes/opensearch.ts → ...om_import_map/server/routes/opensearch.ts b/...om_import_map/server/routes/opensearch.ts → ...om_import_map/server/routes/opensearch.ts
diff --git a/...map/server/services/geospatial_service.js → ...map/server/services/geospatial_service.js b/...map/server/services/geospatial_service.js → ...map/server/services/geospatial_service.js
diff --git a/...ustom_import_map/server/services/index.js → custom_import_map/server/services/index.js b/...ustom_import_map/server/services/index.js → custom_import_map/server/services/index.js
diff --git a/...map/server/services/opensearch_service.js → ...map/server/services/opensearch_service.js b/...map/server/services/opensearch_service.js → ...map/server/services/opensearch_service.js
diff --git a/...rt_map/server/services/utils/constants.ts → ...rt_map/server/services/utils/constants.ts b/...rt_map/server/services/utils/constants.ts → ...rt_map/server/services/utils/constants.ts
diff --git a/...plugins/custom_import_map/server/types.ts → custom_import_map/server/types.ts b/...plugins/custom_import_map/server/types.ts → custom_import_map/server/types.ts
diff --git a/src/plugins/custom_import_map/test/enzyme.js → custom_import_map/test/enzyme.js b/src/plugins/custom_import_map/test/enzyme.js → custom_import_map/test/enzyme.js
diff --git a/...ins/custom_import_map/test/jest.config.js → custom_import_map/test/jest.config.js b/...ins/custom_import_map/test/jest.config.js → custom_import_map/test/jest.config.js
@@ -19,7 +19,7 @@ module.exports = {
     '\\.(css|less|scss)$': '<rootDir>/test/mocks/styleMock.js',
     '^ui/(.*)': '<rootDir>/../../src/legacy/ui/public/$1/',
   },
-  snapshotSerializers: ['../../../../node_modules/enzyme-to-json/serializer'],
+  snapshotSerializers: ['../../node_modules/enzyme-to-json/serializer'],
   coverageReporters: ['lcov', 'text', 'cobertura'],
   testMatch: ['**/*.test.js', '**/*.test.ts', '**/*.test.tsx'],
   coveragePathIgnorePatterns: ['<rootDir>/build/', '<rootDir>/node_modules/', '<rootDir>/test/'],

diff --git a/...custom_import_map/test/mocks/styleMock.js → custom_import_map/test/mocks/styleMock.js b/...custom_import_map/test/mocks/styleMock.js → custom_import_map/test/mocks/styleMock.js
diff --git a/...ugins/custom_import_map/test/polyfills.js → custom_import_map/test/polyfills.js b/...ugins/custom_import_map/test/polyfills.js → custom_import_map/test/polyfills.js
diff --git a/...rt_map/test/polyfills/mutationObserver.js → ...rt_map/test/polyfills/mutationObserver.js b/...rt_map/test/polyfills/mutationObserver.js → ...rt_map/test/polyfills/mutationObserver.js
diff --git a/...gins/custom_import_map/test/setup.jest.js → custom_import_map/test/setup.jest.js b/...gins/custom_import_map/test/setup.jest.js → custom_import_map/test/setup.jest.js
diff --git a/...gins/custom_import_map/test/setupTests.js → custom_import_map/test/setupTests.js b/...gins/custom_import_map/test/setupTests.js → custom_import_map/test/setupTests.js
diff --git a/src/plugins/custom_import_map/tsconfig.json → custom_import_map/tsconfig.json b/src/plugins/custom_import_map/tsconfig.json → custom_import_map/tsconfig.json