From 404f2929f80dcba0f8aedc67b0a6a683db45503b Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Fri, 15 Jun 2018 11:01:19 +0900 Subject: [PATCH] Move parse plugin config under plugin_config Signed-off-by: Kenji Okimoto --- app/controllers/api_controller.rb | 2 +- app/javascript/packs/in_tail_parse.js | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index fc2e4d1..6847185 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -19,7 +19,7 @@ class ApiController < ApplicationController end def regexp_preview - preview = RegexpPreview.processor(params[:parse_type]).new(params[:file], params[:parse_type], params) + preview = RegexpPreview.processor(params[:parse_type]).new(params[:file], params[:parse_type], params[:plugin_config]) render json: preview.matches end diff --git a/app/javascript/packs/in_tail_parse.js b/app/javascript/packs/in_tail_parse.js index 02ef0c5..6cfc91e 100644 --- a/app/javascript/packs/in_tail_parse.js +++ b/app/javascript/packs/in_tail_parse.js @@ -26,7 +26,7 @@ $(document).ready(() => { }, watch: { 'parse.expression': function() { - console.log('parse.expression') + console.log(`parse.expression: ${this.parse.expression}`) this.preview() }, 'parse.time_format': function() { @@ -53,7 +53,7 @@ $(document).ready(() => { this.parseType = name }, onChangeParseConfig: function(data) { - console.log("onChangeParseConfig") + console.log(`onChangeParseConfig: ${data}`) _.merge(this.parse, data) this.preview() }, @@ -132,8 +132,6 @@ $(document).ready(() => { 'X-CSRF-Token': this.token }, data: { - expression: this.parse.expression, - time_format: this.parse.timeFormat, parse_type: _.isEmpty(this.parseType) ? "regexp" : this.parseType, file: this.path, plugin_config: this.parse