Code restructure

Author: TrumanDu

.eslintrc

@@ -1,2 +1,7 @@
 ---
 extends: "@elastic/kibana"
+
+settings:
+  import/resolver:
+    '@elastic/eslint-import-resolver-kibana':
+      rootPackageName: 'indices_view'

.gitignore

@@ -1,4 +1,3 @@
 npm-debug.log*
 node_modules
 /build/
-package-lock.json

.kibana-plugin-helpers.json

@@ -0,0 +1,3 @@
+{
+  "styleSheetToCompile": "public/app.scss"
+}

README.md

@@ -1,4 +1,9 @@
-# indies_view
+# indices_view
+
+> An awesome kibana plugin for view indies!
+
+---
+
 ## Language   
 - [EN](./README.md)
 - [中文](./README_ZH.md)
@@ -13,41 +18,56 @@
 ## Reg pattern
 
 ```
-1. /[^a-z]+$/
-2. /[\d]{4}[-|\.|/][\d]{1,2}[-|\.|/][\d]{1,2}/
+1. [^a-z]+$
+2. [\d]{4}[-|\.|/][\d]{1,2}[-|\.|/][\d]{1,2}
+```
+
+## Config
+kibana.yml
+
+1. mergePattern
+
+   merge pattern,default value is '[^a-z]+$'. you can edit it. like: 
+```
+indices_view.mergePattern: '[\d]{4}[-|\.|/][\d]{1,2}[-|\.|/][\d]{1,2}'
 ```
 ## Development
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment. Once you have completed that, use the following npm tasks.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment. Once you have completed that, use the following yarn scripts.
+
+  - `yarn kbn bootstrap`
 
-  - `npm start`
+    Install dependencies and crosslink Kibana and all projects/plugins.
 
-    Start kibana and have it include this plugin
+    > ***IMPORTANT:*** Use this script instead of `yarn` to install dependencies when switching branches, and re-run it whenever your dependencies change.
 
-  - `npm start -- --config kibana.yml`
+  - `yarn start`
 
-    You can pass any argument that you would normally send to `bin/kibana` by putting them after `--` when running `npm start`
+    Start kibana and have it include this plugin. You can pass any arguments that you would normally send to `bin/kibana`
 
-  - `npm run build`
+      ```
+      yarn start --elasticsearch.url http://localhost:9220
+      ```
 
-    Build a distributable archive
+  - `yarn build`
 
-  - `npm run test:browser`
+    Build a distributable archive of your plugin.
 
-    Run the browser tests in a real web browser
+  - `yarn test:browser`
 
-  - `npm run test:server`
+    Run the browser tests in a real web browser.
 
-    Run the server tests using mocha
+  - `yarn test:server`
 
-For more information about any of these commands run `npm run ${task} -- --help`.
+    Run the server tests using mocha.
 
+For more information about any of these commands run `yarn ${task} --help`. For a full list of tasks checkout the `package.json` file, or run `yarn run`.
 ## Deploy
 
 **important** : edit this plugin version and kibana.version to you kibana version in package.json
 
-- `npm install`
-- `npm run build`
+- `yarn kbn bootstrap`
+- `yarn build`
 
 Build a distributable archive
 

README_ZH.md

@@ -19,38 +19,53 @@
 1. /[^a-z]+$/
 2. /[\d]{4}[-|\.|/][\d]{1,2}[-|\.|/][\d]{1,2}/
 ```
+## 配置
+kibana.yml
+
+1. mergePattern
+
+   默认值是 '[^a-z]+$'. 你可以按如下格式修改: 
+```
+indices_view.mergePattern: '[\d]{4}[-|\.|/][\d]{1,2}[-|\.|/][\d]{1,2}'
+```
 ## 开发流程
 
-查看[kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) 官方文档，构建开发环境，搭建好环境后，按以下步骤进行。
+查看 [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) 官方文档，构建开发环境，搭建好环境后，按以下步骤进行。
+
+  - `yarn kbn bootstrap`
+
+    安装所有依赖，并建立所有插件与kibana连接。
 
-  - `npm start`
+    > ***重要:*** 使用 `yarn` 代替安装依赖，无论是切换分支还是其他需要重新下载依赖的情况.
 
-    启动kibana
+  - `yarn start`
 
-  - `npm start -- --config kibana.yml`
+    Start kibana and have it include this plugin. You can pass any arguments that you would normally send to `bin/kibana`
 
-    可以通过这个命令指定kibana 配置文件
+      ```
+      yarn start --elasticsearch.url http://localhost:9220
+      ```
 
-  - `npm run build`
+  - `yarn build`
 
     生成编译包
 
-  - `npm run test:browser`
+  - `yarn test:browser`
 
     在web 浏览器中测试
 
-  - `npm run test:server`
+  - `yarn test:server`
 
     用mocha 测试服务端
 
-更多信息执行`npm run ${task} -- --help`.
+更多信息执行`yarn ${task} --help`. 完整任务列表查看`package.json` 文件, 或者运行 `yarn run`.
 
 ## 部署
 
 **重要** : 修改这个插件的版本kibana.version 和你在kibana package.json 中的版本保持一致！
 
-- `npm install`
-- `npm run build`
+- `yarn kbn bootstrap`
+- `yarn build`
 
 按以上步骤生成安装包。
 

TRANSLATION.md

@@ -1,25 +1,42 @@
-
-import serverRoute from './server/routes/server';
+import serverRoute from './server/routes/serverRoute';
+const elasticsearch = require('elasticsearch');
 export default function (kibana) {
   return new kibana.Plugin({
     require: ['elasticsearch'],
     name: 'indices_view',
     uiExports: {
-
       app: {
         title: 'Indices View',
-        description: 'An awesome kibana plugin for view indices!',
+        description: 'An awesome kibana plugin for view indies!',
+        main: 'plugins/indices_view/app',
         icon: 'plugins/indices_view/icon.svg',
-        main: 'plugins/indices_view/app'
+        styleSheetPath: require('path').resolve(__dirname, 'public/app.scss'),
       },
+      injectDefaultVars: function (server) {
+        const config = server.config();
+        const pattern = config.get('indices_view.mergePattern');
+        return {
+          mergePattern: pattern,
+        };
+      }
     },
 
+    config(Joi) {
+      return Joi.object({
+        enabled: Joi.boolean().default(true),
+        mergePattern: Joi.string().default('[^a-z]+$'),
+      }).default();
+    },
 
-    init(server) {
+    init(server, options) { // eslint-disable-line no-unused-vars
       // Add server routes and initialize the plugin here
-      serverRoute(server);
+      const config = server.config();
+      const client = new elasticsearch.Client({
+        host: config.get('elasticsearch.url'),
+        //log: 'trace'
+        requestTimeout: 120000
+      });
+      serverRoute(server, client);
     }
-
-
   });
-}
+}

gather-info.js

@@ -5,30 +5,34 @@
   "main": "index.js",
   "kibana": {
     "version": "kibana",
-    "templateVersion": "7.2.3"
+    "templateVersion": "1.0.0"
   },
   "scripts": {
-    "lint": "eslint",
+    "preinstall": "node ../../kibana/preinstall_check",
+    "kbn": "node ../../kibana/scripts/kbn",
+    "lint": "eslint .",
     "start": "plugin-helpers start",
     "test:server": "plugin-helpers test:server",
     "test:browser": "plugin-helpers test:browser",
-    "build": "plugin-helpers build",
-    "postinstall": "plugin-helpers postinstall",
-    "gather-info": "node gather-info.js"
+    "build": "plugin-helpers build"
   },
   "devDependencies": {
-    "@elastic/eslint-config-kibana": "^0.6.1",
-    "@elastic/plugin-helpers": "^7.0.2",
-    "babel-eslint": "^7.2.3",
-    "eslint": "^3.19.0",
+    "@elastic/eslint-config-kibana": "link:../../kibana/packages/eslint-config-kibana",
+    "@elastic/eslint-import-resolver-kibana": "link:../../kibana/packages/kbn-eslint-import-resolver-kibana",
+    "@kbn/plugin-helpers": "link:../../kibana/packages/kbn-plugin-helpers",
+    "babel-eslint": "^8.0.2",
+    "eslint": "^4.11.0",
     "eslint-plugin-babel": "^4.1.1",
     "eslint-plugin-import": "^2.3.0",
+    "eslint-plugin-jest": "^21.3.2",
     "eslint-plugin-mocha": "^4.9.0",
+    "eslint-plugin-no-unsanitized": "^3.0.2",
+    "eslint-plugin-prefer-object-spread": "^1.2.1",
     "eslint-plugin-react": "^7.0.1",
     "expect.js": "^0.3.1"
   },
   "dependencies": {
-    "angular-ui-bootstrap": "^2.5.6",
-    "elasticsearch": "^14.1.0"
+    "axios": "^0.18.0",
+    "elasticsearch": "^15.1.1"
   }
-}
+}