fix: remove dataurl type (elastic#613)

w33ble · May 22, 2018 · f51cef3 · f51cef3
1 parent 0fce399
commit f51cef3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 30 deletions.
diff --git a/common/types/dataurl.js b/common/types/dataurl.js
diff --git a/common/types/index.js b/common/types/index.js
@@ -1,6 +1,5 @@
 import { boolean } from './boolean';
 import { datatable } from './datatable';
-import { dataurl } from './dataurl';
 import { error } from './error';
 import { filter } from './filter';
 import { image } from './image';
@@ -15,7 +14,6 @@ import { style } from './style';
 export const typeSpecs = [
   boolean,
   datatable,
-  dataurl,
   error,
   filter,
   image,

diff --git a/public/expression_types/arg_types/image_upload/image_upload.js b/public/expression_types/arg_types/image_upload/image_upload.js
@@ -58,16 +58,15 @@ class ImageUpload extends React.Component {
   render() {
     const { resolvedArgValue } = this.props;
     const isLoading = this.state.loading;
-    const isDataUrl =
-      resolvedArgValue && resolvedArgValue.type === 'dataurl' && isValid(resolvedArgValue.value);
+    const isDataUrl = resolvedArgValue && isValid(resolvedArgValue);
 
     const previewImage = isDataUrl && (
       <EuiImage
         size="s"
         hasShadow
         allowFullScreen
         alt="Image Preview"
-        url={resolvedArgValue.value}
+        url={resolvedArgValue}
         className="canvas__checkered"
       />
     );

diff --git a/public/functions/asset.js b/public/functions/asset.js
@@ -7,6 +7,7 @@ export const asset = () => ({
   context: {
     types: ['null'],
   },
+  type: 'string',
   help: 'Use Canvas workpad asset objects to provide argument values. Usually images.',
   args: {
     _: {
@@ -18,6 +19,7 @@ export const asset = () => ({
   fn: (context, args) => {
     // TODO: handle the case where the asset id provided doesn't exist
     const assetId = args._;
-    return getAssetById(getState(), assetId);
+    const { value } = getAssetById(getState(), assetId);
+    return value;
   },
 });