Move gantt-chart out from subdirectory (#321) (#325)

Signed-off-by: Joshua Li <[email protected]> (cherry picked from commit 12ad9b7) (cherry picked from commit af334ca)
opensearch-project · Feb 1, 2024 · 994c7b9 · 994c7b9
1 parent 99b9779
commit 994c7b9
Show file tree

Hide file tree

Showing 46 changed files with 28 additions and 35 deletions.
diff --git a/gantt-chart/.babelrc → .babelrc b/gantt-chart/.babelrc → .babelrc
diff --git a/...t-chart/.cypress/utils/jaeger-sample.json → .cypress/fixtures/jaeger-sample.txt b/...t-chart/.cypress/utils/jaeger-sample.json → .cypress/fixtures/jaeger-sample.txt
diff --git a/gantt-chart/.cypress/integration/ui.spec.js → .cypress/integration/ui.spec.js b/gantt-chart/.cypress/integration/ui.spec.js → .cypress/integration/ui.spec.js
diff --git a/gantt-chart/.cypress/plugins/index.js → .cypress/plugins/index.js b/gantt-chart/.cypress/plugins/index.js → .cypress/plugins/index.js
diff --git a/gantt-chart/.cypress/support/commands.js → .cypress/support/commands.js b/gantt-chart/.cypress/support/commands.js → .cypress/support/commands.js
diff --git a/gantt-chart/.cypress/support/constants.js → .cypress/support/constants.js b/gantt-chart/.cypress/support/constants.js → .cypress/support/constants.js
diff --git a/gantt-chart/.cypress/support/index.js → .cypress/support/index.js b/gantt-chart/.cypress/support/index.js → .cypress/support/index.js
diff --git a/gantt-chart/.cypress/tsconfig.json → .cypress/tsconfig.json b/gantt-chart/.cypress/tsconfig.json → .cypress/tsconfig.json
diff --git a/gantt-chart/.cypress/utils/constants.js → .cypress/utils/constants.js b/gantt-chart/.cypress/utils/constants.js → .cypress/utils/constants.js
diff --git a/gantt-chart/.eslintrc.yaml → .eslintrc.yaml b/gantt-chart/.eslintrc.yaml → .eslintrc.yaml
diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml
@@ -15,21 +15,23 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout Plugin
-        uses: actions/checkout@v2
-
       - name: Checkout OpenSearch Dashboards
         uses: actions/checkout@v2
         with:
           repository: opensearch-project/Opensearch-Dashboards
           ref: ${{ env.OPENSEARCH_VERSION }}
-          path: dashboards-visualizations/OpenSearch-Dashboards
+          path: OpenSearch-Dashboards
+
+      - name: Checkout Plugin
+        uses: actions/checkout@v2
+        with:
+          path: OpenSearch-Dashboards/plugins/dashboards-visualizations
 
       - name: Get node and yarn versions
         id: versions_step
         run: |
-          echo "::set-output name=node_version::$(node -p "(require('./dashboards-visualizations/OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")"
-          echo "::set-output name=yarn_version::$(node -p "(require('./dashboards-visualizations/OpenSearch-Dashboards/package.json').engines.yarn).match(/[.0-9]+/)[0]")"
+          echo "::set-output name=node_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")"
+          echo "::set-output name=yarn_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.yarn).match(/[.0-9]+/)[0]")"
 
       - name: Setup node
         uses: actions/setup-node@v1
@@ -43,44 +45,38 @@ jobs:
           echo "Installing yarn ${{ steps.versions_step.outputs.yarn_version }}"
           npm i -g yarn@${{ steps.versions_step.outputs.yarn_version }}
 
-      - name: Move Gantt Chart to Plugins Dir
-        run: |
-          mv gantt-chart ./dashboards-visualizations/OpenSearch-Dashboards/plugins
-
       - name: Plugin Bootstrap
         run: |
-          cd ./dashboards-visualizations/OpenSearch-Dashboards/plugins/gantt-chart
+          cd ./OpenSearch-Dashboards/plugins/dashboards-visualizations
           yarn osd bootstrap
 
       - name: Test
         run: |
-          cd ./dashboards-visualizations/OpenSearch-Dashboards/plugins/gantt-chart
+          cd ./OpenSearch-Dashboards/plugins/dashboards-visualizations
           yarn test --coverage
 
       - name: Upload coverage
         uses: codecov/codecov-action@v1
         with:
-          directory: ./dashboards-visualizations/OpenSearch-Dashboards/plugins/gantt-chart
+          directory: ./OpenSearch-Dashboards/plugins/dashboards-visualizations
           token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Build Artifact
         run: |
-          cd ./dashboards-visualizations/OpenSearch-Dashboards/plugins/gantt-chart
+          cd ./OpenSearch-Dashboards/plugins/dashboards-visualizations
           yarn build
           mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v1
         with:
           name: gantt-chart-ubuntu
-          path: ./dashboards-visualizations/OpenSearch-Dashboards/plugins/gantt-chart/build
+          path: ./OpenSearch-Dashboards/plugins/dashboards-visualizations/build
 
   windows-build:
 
     runs-on: windows-latest
     steps:
-      - name: Checkout Plugin
-        uses: actions/checkout@v2
       # Enable longer filenames for windows
       - name: Enable longer filenames
         run: git config --system core.longpaths true
@@ -90,13 +86,18 @@ jobs:
         with:
           repository: opensearch-project/Opensearch-Dashboards
           ref: ${{ env.OPENSEARCH_VERSION }}
-          path: dashboards-visualizations/OpenSearch-Dashboards
+          path: OpenSearch-Dashboards
+
+      - name: Checkout Plugin
+        uses: actions/checkout@v2
+        with:
+          path: OpenSearch-Dashboards/plugins/dashboards-visualizations
 
       - name: Get node and yarn versions
         id: versions_step
         run: |
-          echo "::set-output name=node_version::$(node -p "(require('./dashboards-visualizations/OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")"
-          echo "::set-output name=yarn_version::$(node -p "(require('./dashboards-visualizations/OpenSearch-Dashboards/package.json').engines.yarn).match(/[.0-9]+/)[0]")"
+          echo "::set-output name=node_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")"
+          echo "::set-output name=yarn_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.yarn).match(/[.0-9]+/)[0]")"
 
       - name: Setup node
         uses: actions/setup-node@v1
@@ -110,28 +111,24 @@ jobs:
           echo "Installing yarn ${{ steps.versions_step.outputs.yarn_version }}"
           npm i -g yarn@${{ steps.versions_step.outputs.yarn_version }}
 
-      - name: Move Gantt Chart to Plugins Dir
-        run: |
-          mv gantt-chart ./dashboards-visualizations/OpenSearch-Dashboards/plugins
-
       - name: Plugin Bootstrap
         run: |
-          cd ./dashboards-visualizations/OpenSearch-Dashboards/plugins/gantt-chart
+          cd ./OpenSearch-Dashboards/plugins/dashboards-visualizations
           yarn osd bootstrap
 
       - name: Test
         run: |
-          cd ./dashboards-visualizations/OpenSearch-Dashboards/plugins/gantt-chart
+          cd ./OpenSearch-Dashboards/plugins/dashboards-visualizations
           yarn test
 
       - name: Build Artifact
         run: |
-          cd ./dashboards-visualizations/OpenSearch-Dashboards/plugins/gantt-chart
+          cd ./OpenSearch-Dashboards/plugins/dashboards-visualizations
           yarn build
           mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v1
         with:
           name: gantt-chart-windows
-          path: ./dashboards-visualizations/OpenSearch-Dashboards/plugins/gantt-chart/build
+          path: ./OpenSearch-Dashboards/plugins/dashboards-visualizations/build
diff --git a/gantt-chart/.gitignore → .gitignore b/gantt-chart/.gitignore → .gitignore
diff --git a/...opensearch_dashboards-plugin-helpers.json → .opensearch_dashboards-plugin-helpers.json b/...opensearch_dashboards-plugin-helpers.json → .opensearch_dashboards-plugin-helpers.json
diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
@@ -11,12 +11,8 @@ So you want to contribute code to this project? Excellent! We're glad you're her
 1. cd into the OpenSearch Dashboards source code directory.
 1. Check out this package from version control into the `plugins` directory.
 ```
-rm plugins -r
-git clone [email protected]:opensearch-project/dashboards-visualizations.git plugins --no-checkout
 cd plugins
-echo 'gantt-chart/*' >> .git/info/sparse-checkout
-git config core.sparseCheckout true
-git checkout main
+git clone [email protected]:opensearch-project/dashboards-visualizations.git
 ```
 6. Run `yarn osd bootstrap` inside `OpenSearch-Dashboards` directory.
 
@@ -26,7 +22,7 @@ Ultimately, your directory structure should look like this:
 .
 ├── OpenSearch Dashboards
 │   └── plugins
-│       └── gantt-chart
+│       └── dashboards-visualizations
 ```
 
 
@@ -57,4 +53,4 @@ The Github workflow in [`backport.yml`](.github/workflows/backport.yml) creates
 with an appropriate label `backport <backport-branch-name>` is merged to main with the backport workflow run successfully on the
 PR. For example, if a PR on main needs to be backported to `1.x` branch, add a label `backport 1.x` to the PR and make sure the
 backport workflow runs on the PR along with other checks. Once this PR is merged to main, the workflow will create a backport PR
-to the `1.x` branch.
+to the `1.x` branch.
diff --git a/gantt-chart/cypress.json → cypress.json b/gantt-chart/cypress.json → cypress.json
diff --git a/gantt-chart/opensearch_dashboards.json → opensearch_dashboards.json b/gantt-chart/opensearch_dashboards.json → opensearch_dashboards.json
diff --git a/gantt-chart/package.json → package.json b/gantt-chart/package.json → package.json
diff --git a/...t/public/__tests__/gantt_vis_type.test.ts → public/__tests__/gantt_vis_type.test.ts b/...t/public/__tests__/gantt_vis_type.test.ts → public/__tests__/gantt_vis_type.test.ts
diff --git a/..._/__snapshots__/gantt_chart.test.tsx.snap → ..._/__snapshots__/gantt_chart.test.tsx.snap b/..._/__snapshots__/gantt_chart.test.tsx.snap → ..._/__snapshots__/gantt_chart.test.tsx.snap
diff --git a/...pshots__/gantt_chart_editor.test.tsx.snap → ...pshots__/gantt_chart_editor.test.tsx.snap b/...pshots__/gantt_chart_editor.test.tsx.snap → ...pshots__/gantt_chart_editor.test.tsx.snap
diff --git a/..._snapshots__/options_editor.test.tsx.snap → ..._snapshots__/options_editor.test.tsx.snap b/..._snapshots__/options_editor.test.tsx.snap → ..._snapshots__/options_editor.test.tsx.snap
diff --git a/...components/__tests__/gantt_chart.test.tsx → ...components/__tests__/gantt_chart.test.tsx b/...components/__tests__/gantt_chart.test.tsx → ...components/__tests__/gantt_chart.test.tsx
diff --git a/...nts/__tests__/gantt_chart_editor.test.tsx → ...nts/__tests__/gantt_chart_editor.test.tsx b/...nts/__tests__/gantt_chart_editor.test.tsx → ...nts/__tests__/gantt_chart_editor.test.tsx
diff --git a/...ponents/__tests__/options_editor.test.tsx → ...ponents/__tests__/options_editor.test.tsx b/...ponents/__tests__/options_editor.test.tsx → ...ponents/__tests__/options_editor.test.tsx
diff --git a/...t-chart/public/components/gantt_chart.tsx → public/components/gantt_chart.tsx b/...t-chart/public/components/gantt_chart.tsx → public/components/gantt_chart.tsx
diff --git a/.../public/components/gantt_chart_editor.tsx → public/components/gantt_chart_editor.tsx b/.../public/components/gantt_chart_editor.tsx → public/components/gantt_chart_editor.tsx
diff --git a/...hart/public/components/options_editor.tsx → public/components/options_editor.tsx b/...hart/public/components/options_editor.tsx → public/components/options_editor.tsx
diff --git a/gantt-chart/public/gantt_request_handler.ts → public/gantt_request_handler.ts b/gantt-chart/public/gantt_request_handler.ts → public/gantt_request_handler.ts
diff --git a/gantt-chart/public/gantt_vis_type.ts → public/gantt_vis_type.ts b/gantt-chart/public/gantt_vis_type.ts → public/gantt_vis_type.ts
diff --git a/gantt-chart/public/index.scss → public/index.scss b/gantt-chart/public/index.scss → public/index.scss
diff --git a/gantt-chart/public/index.ts → public/index.ts b/gantt-chart/public/index.ts → public/index.ts
diff --git a/gantt-chart/public/plugin.ts → public/plugin.ts b/gantt-chart/public/plugin.ts → public/plugin.ts
diff --git a/gantt-chart/server/index.ts → server/index.ts b/gantt-chart/server/index.ts → server/index.ts
diff --git a/gantt-chart/server/plugin.ts → server/plugin.ts b/gantt-chart/server/plugin.ts → server/plugin.ts
diff --git a/gantt-chart/server/routes/index.ts → server/routes/index.ts b/gantt-chart/server/routes/index.ts → server/routes/index.ts
diff --git a/gantt-chart/server/types.ts → server/types.ts b/gantt-chart/server/types.ts → server/types.ts
diff --git a/gantt-chart/test/jest.config.js → test/jest.config.js b/gantt-chart/test/jest.config.js → test/jest.config.js
diff --git a/gantt-chart/test/mocks/fileMock.ts → test/mocks/fileMock.ts b/gantt-chart/test/mocks/fileMock.ts → test/mocks/fileMock.ts
diff --git a/gantt-chart/test/mocks/httpClientMock.ts → test/mocks/httpClientMock.ts b/gantt-chart/test/mocks/httpClientMock.ts → test/mocks/httpClientMock.ts
diff --git a/gantt-chart/test/mocks/mockData.ts → test/mocks/mockData.ts b/gantt-chart/test/mocks/mockData.ts → test/mocks/mockData.ts
diff --git a/gantt-chart/test/mocks/routerPropsMock.ts → test/mocks/routerPropsMock.ts b/gantt-chart/test/mocks/routerPropsMock.ts → test/mocks/routerPropsMock.ts
diff --git a/gantt-chart/test/mocks/styleMock.ts → test/mocks/styleMock.ts b/gantt-chart/test/mocks/styleMock.ts → test/mocks/styleMock.ts
diff --git a/gantt-chart/test/setup.jest.ts → test/setup.jest.ts b/gantt-chart/test/setup.jest.ts → test/setup.jest.ts
diff --git a/gantt-chart/test/setupTests.ts → test/setupTests.ts b/gantt-chart/test/setupTests.ts → test/setupTests.ts
diff --git a/gantt-chart/tsconfig.json → tsconfig.json b/gantt-chart/tsconfig.json → tsconfig.json
diff --git a/gantt-chart/yarn.lock → yarn.lock b/gantt-chart/yarn.lock → yarn.lock