Add support for Kibana 7.10.0 (#144)

Add support for Kibana 7.10.0 Co-authored-by: Yan Zeng <[email protected]> Co-authored-by: Yuanqi(Ella) Zhu <[email protected]> Co-authored-by: Tianli Feng <[email protected]> Co-authored-by: Drew Baugher <[email protected]>
opendistro-for-elasticsearch · Dec 5, 2020 · cb7fb8a · cb7fb8a
1 parent acd0627
commit cb7fb8a
Show file tree

Hide file tree

Showing 95 changed files with 2,328 additions and 4,398 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ yarn-error.log
 .DS_Store
 /cypress/screenshots/
 /cypress/videos/
+target
diff --git a/.kibana-plugin-helpers.json b/.kibana-plugin-helpers.json
@@ -1,11 +1,9 @@
 {
-  "styleSheetToCompile": "public/app.scss",
-  "buildSourcePatterns": [
+  "serverSourcePatterns": [
     "package.json",
     "tsconfig.json",
     "yarn.lock",
     ".yarnrc",
-    "index.js",
     "{lib,public,server,webpackShims,translations,utils,models,test}/**/*",
     "!__tests__"
   ]

diff --git a/README.md b/README.md
@@ -33,14 +33,15 @@ Ultimately, your directory structure should look like this:
 
 To build the plugin's distributable zip simply run `yarn build`.
 
-Example output: `./build/opendistro_index_management_kibana-1.3.0.0.zip`
+Example output: `./build/opendistroIndexManagementKibana-1.12.0.0.zip`
 
 
 ## Run
 
 - `yarn start`
 
   - Starts Kibana and includes this plugin. Kibana will be available on `localhost:5601`.
+  - Please run in the Kibana root directory
   - You must have Elasticsearch running with the Index Management plugin
 
 ## Test
@@ -66,7 +67,7 @@ If you are running cypress tests with Kibana development server use the `--no-ba
 ## Contributing to Open Distro for Elasticsearch Index Management Kibana
 
 - Refer to [CONTRIBUTING.md](./CONTRIBUTING.md).
-- Since this is a Kibana plugin, it can be useful to review the [Kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) alongside the documentation around [Kibana plugins](https://www.elastic.co/guide/en/kibana/master/kibana-plugins.html) and [plugin development](https://www.elastic.co/guide/en/kibana/master/plugin-development.html).
+- Since this is a Kibana plugin, it can be useful to review the [Kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) alongside the documentation around [Kibana plugins](https://www.elastic.co/guide/en/kibana/master/kibana-plugins.html) and [plugin development](https://www.elastic.co/guide/en/kibana/master/external-plugin-development.html).
 
 ## Get Started and Contribute!
 

diff --git a/index.js b/index.js
diff --git a/kibana.json b/kibana.json
@@ -0,0 +1,9 @@
+{
+  "id": "opendistroIndexManagementKibana",
+  "version": "1.12.0.0",
+  "kibanaVersion": "7.10.0",
+  "configPath": ["opendistro_index_management"],
+  "requiredPlugins": ["navigation"],
+  "server": true,
+  "ui": true
+}
diff --git a/package.json b/package.json
@@ -1,29 +1,26 @@
 {
   "name": "opendistro_index_management_kibana",
-  "version": "1.11.0.0",
+  "version": "1.12.0.0",
   "description": "Kibana plugin for Index Management",
   "main": "index.js",
   "license": "Apache-2.0",
   "homepage": "https://github.com/opendistro-for-elasticsearch/index-management-kibana-plugin",
-  "kibana": {
-    "version": "7.9.1",
-    "templateVersion": "1.0.0"
+  "config": {
+    "id": "opendistroIndexManagementKibana"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/opendistro-for-elasticsearch/index-management-kibana-plugin"
   },
   "scripts": {
     "cypress:open": "cypress open",
-    "preinstall": "node ../../preinstall_check",
     "kbn": "node ../../scripts/kbn",
     "es": "node ../../scripts/es",
     "lint": "eslint .",
-    "start": "plugin-helpers start",
-    "test:server": "plugin-helpers test:server",
-    "test:browser": "plugin-helpers test:browser",
+    "plugin-helpers": "node ../../scripts/plugin_helpers",
     "test:jest": "NODE_PATH=../../node_modules ../../node_modules/.bin/jest --config ./test/jest.config.js",
-    "build": "plugin-helpers build"
+    "build": "yarn plugin-helpers build",
+    "postbuild": "echo Renaming build artifact to [$npm_package_config_id-$npm_package_version.zip] && mv build/$npm_package_config_id*.zip build/$npm_package_config_id-$npm_package_version.zip"
   },
   "husky": {
     "hooks": {
@@ -39,49 +36,20 @@
     "**/@types/react-router-dom": "^4.3.1",
     "eslint-utils": "^1.4.2"
   },
-  "dependencies": {
-    "@babel/runtime": "^7.8.4",
-    "brace": "^0.11.1",
-    "query-string": "^6.8.1"
-  },
   "devDependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.7.4",
-    "@babel/plugin-proposal-object-rest-spread": "^7.7.4",
-    "@babel/plugin-transform-runtime": "^7.8.3",
-    "@babel/preset-env": "^7.7.6",
-    "@babel/preset-react": "^7.7.4",
-    "@babel/preset-typescript": "^7.3.3",
-    "@elastic/elasticsearch": "^7.2.0",
-    "@elastic/eslint-config-kibana": "link:../../packages/eslint-config-kibana",
+    "@elastic/elastic-eslint-config-kibana": "link:../../packages/elastic-eslint-config-kibana",
     "@elastic/eslint-import-resolver-kibana": "link:../../packages/kbn-eslint-import-resolver-kibana",
-    "@kbn/expect": "link:../../packages/kbn-expect",
-    "@kbn/plugin-helpers": "link:../../packages/kbn-plugin-helpers",
-    "@testing-library/jest-dom": "^4.0.0",
-    "@testing-library/react": "^8.0.5",
-    "@testing-library/user-event": "^4.1.0",
-    "@types/angular": "1.6.50",
-    "@types/node": "^10.12.27",
-    "@types/react": "16.9.8",
     "@types/react-dom": "^16.9.8",
     "@types/react-router-dom": "^5.1.5",
-    "babel-eslint": "^9.0.0",
     "cypress": "4.3.0",
-    "eslint-plugin-babel": "^5.2.0",
-    "eslint-plugin-cypress": "^2.10.3",
-    "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-jest": "^21.26.2",
-    "eslint-plugin-jsx-a11y": "^6.1.2",
-    "eslint-plugin-mocha": "^5.2.0",
     "eslint-plugin-no-unsanitized": "^3.0.2",
     "eslint-plugin-prefer-object-spread": "^1.2.1",
-    "eslint-plugin-react": "^7.11.1",
     "husky": "^3.0.0",
     "lint-staged": "^9.2.0",
-    "ts-loader": "^6.2.1",
-    "typescript": "3.7.2"
+    "ts-loader": "^6.2.1"
   },
   "engines": {
-    "node": "10.22.0",
+    "node": "10.22.1",
     "yarn": "^1.21.1"
   }
 }
diff --git a/public/app.js b/public/app.js
diff --git a/public/components/ConfirmationModal/__snapshots__/ConfirmationModal.test.tsx.snap b/public/components/ConfirmationModal/__snapshots__/ConfirmationModal.test.tsx.snap
@@ -5,11 +5,15 @@ exports[`<ConfirmationModal /> spec renders the component 1`] = `
   class="euiOverlayMask euiOverlayMask--aboveHeader"
 >
   <div
+    aria-hidden="true"
+    data-aria-hidden="true"
     data-focus-guard="true"
     style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
     tabindex="0"
   />
   <div
+    aria-hidden="true"
+    data-aria-hidden="true"
     data-focus-guard="true"
     style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
     tabindex="1"
@@ -59,7 +63,7 @@ exports[`<ConfirmationModal /> spec renders the component 1`] = `
             type="button"
           >
             <span
-              class="euiButtonEmpty__content"
+              class="euiButtonContent euiButtonEmpty__content"
             >
               <span
                 class="euiButtonEmpty__text"
@@ -74,7 +78,7 @@ exports[`<ConfirmationModal /> spec renders the component 1`] = `
             type="button"
           >
             <span
-              class="euiButton__content"
+              class="euiButtonContent euiButton__content"
             >
               <span
                 class="euiButton__text"
@@ -88,6 +92,8 @@ exports[`<ConfirmationModal /> spec renders the component 1`] = `
     </div>
   </div>
   <div
+    aria-hidden="true"
+    data-aria-hidden="true"
     data-focus-guard="true"
     style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
     tabindex="0"

diff --git a/public/components/ContentPanel/__snapshots__/ContentPanelActions.test.tsx.snap b/public/components/ContentPanel/__snapshots__/ContentPanelActions.test.tsx.snap
@@ -13,7 +13,7 @@ exports[`<ContentPanelActions /> spec renders the component 1`] = `
       type="button"
     >
       <span
-        class="euiButton__content"
+        class="euiButtonContent euiButton__content"
       >
         <span
           class="euiButton__text"

diff --git a/public/components/PolicyModal/__snapshots__/PolicyModal.test.tsx.snap b/public/components/PolicyModal/__snapshots__/PolicyModal.test.tsx.snap
@@ -5,11 +5,15 @@ exports[`<PolicyModal /> spec renders the component 1`] = `
   class="euiOverlayMask euiOverlayMask--aboveHeader"
 >
   <div
+    aria-hidden="true"
+    data-aria-hidden="true"
     data-focus-guard="true"
     style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
     tabindex="0"
   />
   <div
+    aria-hidden="true"
+    data-aria-hidden="true"
     data-focus-guard="true"
     style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
     tabindex="1"
@@ -103,7 +107,7 @@ exports[`<PolicyModal /> spec renders the component 1`] = `
                   type="button"
                 >
                   <span
-                    class="euiButtonEmpty__content"
+                    class="euiButtonContent euiButtonEmpty__content"
                   >
                     EuiIconMock
                     <span
@@ -124,7 +128,7 @@ exports[`<PolicyModal /> spec renders the component 1`] = `
                 type="button"
               >
                 <span
-                  class="euiButtonEmpty__content"
+                  class="euiButtonContent euiButtonEmpty__content"
                 >
                   <span
                     class="euiButtonEmpty__text"
@@ -143,7 +147,7 @@ exports[`<PolicyModal /> spec renders the component 1`] = `
                 type="button"
               >
                 <span
-                  class="euiButton__content"
+                  class="euiButtonContent euiButton__content"
                 >
                   <span
                     class="euiButton__text"
@@ -159,6 +163,8 @@ exports[`<PolicyModal /> spec renders the component 1`] = `
     </div>
   </div>
   <div
+    aria-hidden="true"
+    data-aria-hidden="true"
     data-focus-guard="true"
     style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
     tabindex="0"