[ML] Changing file data visualizer max upload setting to string (elas…

…tic#63502) (elastic#63603)
justinkambic · Apr 15, 2020 · 720d07d · 720d07d
1 parent 6142a54
commit 720d07d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/x-pack/plugins/ml/common/constants/file_datavisualizer.ts b/x-pack/plugins/ml/common/constants/file_datavisualizer.ts
@@ -4,8 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export const MAX_BYTES = 104857600; // 100MB
-export const ABSOLUTE_MAX_BYTES = 1073741274; // 1GB
+export const MAX_FILE_SIZE = '100MB';
+export const MAX_FILE_SIZE_BYTES = 104857600; // 100MB
+
+export const ABSOLUTE_MAX_FILE_SIZE_BYTES = 1073741274; // 1GB
 export const FILE_SIZE_DISPLAY_FORMAT = '0,0.[0] b';
 
 // Value to use in the Elasticsearch index mapping meta data to identify the

diff --git a/x-pack/plugins/ml/common/types/ml_config.ts b/x-pack/plugins/ml/common/types/ml_config.ts
@@ -5,11 +5,11 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { MAX_BYTES } from '../constants/file_datavisualizer';
+import { MAX_FILE_SIZE } from '../constants/file_datavisualizer';
 
 export const configSchema = schema.object({
   file_data_visualizer: schema.object({
-    max_file_size_bytes: schema.number({ defaultValue: MAX_BYTES }),
+    max_file_size: schema.string({ defaultValue: MAX_FILE_SIZE }),
   }),
 });
 

diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/utils/utils.ts b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/utils/utils.ts
@@ -9,7 +9,8 @@ import numeral from '@elastic/numeral';
 import { ml } from '../../../../services/ml_api_service';
 import { AnalysisResult, InputOverrides } from '../../../../../../common/types/file_datavisualizer';
 import {
-  ABSOLUTE_MAX_BYTES,
+  MAX_FILE_SIZE_BYTES,
+  ABSOLUTE_MAX_FILE_SIZE_BYTES,
   FILE_SIZE_DISPLAY_FORMAT,
 } from '../../../../../../common/constants/file_datavisualizer';
 import { getMlConfig } from '../../../../util/dependency_cache';
@@ -61,8 +62,13 @@ export function readFile(file: File) {
 }
 
 export function getMaxBytes() {
-  const maxBytes = getMlConfig().file_data_visualizer.max_file_size_bytes;
-  return maxBytes < ABSOLUTE_MAX_BYTES ? maxBytes : ABSOLUTE_MAX_BYTES;
+  const maxFileSize = getMlConfig().file_data_visualizer.max_file_size;
+  // @ts-ignore
+  const maxBytes = numeral(maxFileSize.toUpperCase()).value();
+  if (maxBytes < MAX_FILE_SIZE_BYTES) {
+    return MAX_FILE_SIZE_BYTES;
+  }
+  return maxBytes < ABSOLUTE_MAX_FILE_SIZE_BYTES ? maxBytes : ABSOLUTE_MAX_FILE_SIZE_BYTES;
 }
 
 export function getMaxBytesFormatted() {

diff --git a/x-pack/plugins/ml/server/routes/file_data_visualizer.ts b/x-pack/plugins/ml/server/routes/file_data_visualizer.ts
@@ -6,7 +6,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { RequestHandlerContext } from 'kibana/server';
-import { MAX_BYTES } from '../../common/constants/file_datavisualizer';
+import { MAX_FILE_SIZE_BYTES } from '../../common/constants/file_datavisualizer';
 import {
   InputOverrides,
   Settings,
@@ -79,7 +79,7 @@ export function fileDataVisualizerRoutes({ router, mlLicense }: RouteInitializat
       options: {
         body: {
           accepts: ['text/*', 'application/json'],
-          maxBytes: MAX_BYTES,
+          maxBytes: MAX_FILE_SIZE_BYTES,
         },
       },
     },
@@ -121,7 +121,7 @@ export function fileDataVisualizerRoutes({ router, mlLicense }: RouteInitializat
       options: {
         body: {
           accepts: ['application/json'],
-          maxBytes: MAX_BYTES,
+          maxBytes: MAX_FILE_SIZE_BYTES,
         },
       },
     },