update to 7.12.1 from bjacomy fork

gwintzer · Sep 2, 2021 · d827690 · d827690
1 parent bd793dc
commit d827690
Show file tree

Hide file tree

Showing 25 changed files with 173 additions and 269 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/CHANGES.md b/CHANGES.md
diff --git a/Demo.png b/Demo.png
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -18,11 +18,6 @@ bin/kibana-plugin install https://github.com/PhaedrusTheGreek/transform_vis/rele
 
 
 ![Transform Vis](https://raw.githubusercontent.com/PhaedrusTheGreek/transform_vis/master/transform_vis.png)
-## Samples with plotly.js:
-![Transform Vis](https://github.com/guanghaofan/transform_vis/blob/master/doc/boxplot.png)
-![Transform Vis](https://github.com/guanghaofan/transform_vis/blob/master/doc/scatter.png)
-![Transform Vis](https://github.com/guanghaofan/transform_vis/blob/master/doc/spc.png)
-
 
 ## Variable Binding
 

diff --git a/RECIPES.md b/RECIPES.md
diff --git a/TESTS.md b/TESTS.md
diff --git a/kibana.json b/kibana.json
@@ -1,6 +1,6 @@
 {
   "id": "transformVis",
-  "version": "7.10.0",
+  "version": "7.12.1",
   "server": true,
   "ui": true,
   "requiredPlugins": ["navigation","data","kibanaReact","kibanaUtils", "visualizations", "expressions","visDefaultEditor"],

diff --git a/package.json b/package.json
@@ -1,16 +1,13 @@
 {
   "name": "transform_vis",
-  "version": "7.10.0",
+  "version": "7.12.1",
   "description": "Transform Visualization",
   "main": "index.js",
   "kibana": {
-    "version": "7.10.0",
+    "version": "7.12.1",
     "templateVersion": "1.0.0"
   },
   "license": "Apache-2.0",
-  "contributors": [
-    "Alexander Shepel <[email protected]>"
-  ],
   "keywords": [
     "kibana",
     "transform_vis",
@@ -28,7 +25,7 @@
   },
 
   "devDependencies": {
-    "@elastic/eui": "29.3.0",
+    "@elastic/eui": "29.3.2",
     "@types/babel__standalone": "^7.1.2",
     "babel-eslint": "^10.0.3",
     "eslint": "^6.8.0",

diff --git a/public/_transform_vis.scss b/public/_transform_vis.scss
@@ -2,6 +2,7 @@
   .visEditorSidebar__config > *,
   .visEditor--transform__textarea {
     flex-grow: 1;
+
     min-height:200px;
   }
 }

diff --git a/public/_vega_editor.scss b/public/_vega_editor.scss
diff --git a/public/_vega_vis.scss b/public/_vega_vis.scss
diff --git a/public/legacy.ts b/public/legacy.ts
@@ -1,4 +1,4 @@
-import { PluginInitializerContext } from 'kibana/public';
+/*import { PluginInitializerContext } from 'kibana/public';
 import { npSetup, npStart } from 'ui/new_platform';
 
 import { TransformPluginSetupDependencies } from './plugin';
@@ -14,4 +14,4 @@ const plugins: Readonly<TransformPluginSetupDependencies> = {
 const pluginInstance = plugin({} as PluginInitializerContext);
 
 export const setup = pluginInstance.setup(npSetup.core, plugins);
-export const start = pluginInstance.start(npStart.core, plugins);
+export const start = pluginInstance.start(npStart.core, plugins);*/
diff --git a/public/plugin.ts b/public/plugin.ts
@@ -1,9 +1,9 @@
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, IUiSettingsClient, HttpSetup } from 'kibana/public';
 import { Plugin as ExpressionsPublicPlugin } from '../../../src/plugins/expressions/public';
 import { VisualizationsSetup } from '../../../src/plugins/visualizations/public';
 import { createTransformVisDefinition } from './transform_vis';
 import { createTransformVisFn } from './transform_fn';
-import { DataPublicPluginSetup, DataPublicPluginStart ,IDataPluginServices} from '../../../src/plugins/data/public';
+import { DataPublicPluginSetup, DataPublicPluginStart ,IDataPluginServices, TimefilterContract} from '../../../src/plugins/data/public';
 
 
 import {
@@ -12,6 +12,7 @@ import {
   setSavedObjects,
   setInjectedMetadata,
 } from './services';
+import { getTransformVisRenderer } from './transform_vis_renderer';
 
 
 
@@ -30,23 +31,34 @@ export interface TransformPluginStartDependencies {
   uiActions:IDataPluginServices;
 }
 
+export interface TransformVisDependencies extends Partial<CoreStart> {
+  uiSettings: IUiSettingsClient;
+  http: HttpSetup;
+  timefilter: TimefilterContract;
+}
 /** @internal */
 export class TransformPlugin implements Plugin<void, void> {
   initializerContext: PluginInitializerContext;
 
   constructor(initializerContext: PluginInitializerContext) {
     this.initializerContext = initializerContext;
   }
-
+  
   public async setup(
     core: CoreSetup,
     { expressions, visualizations, data  }: TransformPluginSetupDependencies
   ) {
   //setData(dataStart);
+  const dependencies: TransformVisDependencies = {
+    uiSettings: core.uiSettings,
+    http: core.http,
+    timefilter: data.query.timefilter.timefilter,
+  };
   const config = createTransformVisDefinition({ uiSettings: core.uiSettings,  data });
-  visualizations.createReactVisualization(config);
+  expressions.registerRenderer(getTransformVisRenderer(dependencies));
+  visualizations.createBaseVisualization(config);
   expressions.registerFunction(() =>
-    createTransformVisFn({ uiSettings: core.uiSettings,  timeFilter: data.query.timefilter.timefilter})
+    createTransformVisFn({ uiSettings: core.uiSettings,  timeFilter: data.query.timefilter})
   );
 
   }