fluentd-ui 0.4.5 → 1.0.0.alpha.1

data/app/views/shared/vue/_in_tail_format.html.erb

@@ -1,28 +1,4 @@
-<script type="text/template" id="format-bundle">
-    <div class="form-inline form-group">
-      <label for="in_tail_setting_format">format</label>
-      <select id="in_tail_setting_format" name="setting[format]" v-model="format" class="form-control">
-        <option v-repeat="selectableFormats" value="{{ $value }}" v-attr="selected: format==$value">{{ $value }}</option>
-      </select>
-    </div>
-    <div class="form-inline form-group" v-repeat="options">
-      <label for="in_tail_setting_{{ $value }}" v-if="!useTextArea">{{ $value }} </label>
-      <input id="in_tail_setting_{{ $value }}" type="{{ useTextArea ? 'hidden' : 'text' }}" name="setting[{{ $value }}]" v-model="params.setting[$value]" v-on="keyup: onKeyup" size="100%" class="form-control" />
-    </div>
-
-    <div v-if="useTextArea">
-      <div class="form-inline form-group">
-        <label for="in_tail_setting_format_firstline">format_firstline</label>
-        <input id="in_tail_setting_format_firstline" type="text" name="setting[format_firstline]" v-model="params.setting['format_firstline']" v-on="keyup: onKeyup" size="100%" class="form-control" />
-      </div>
-
-      <div class="form-group">
-       <p class="alert alert-warning"><%= t("fluentd.settings.in_tail.notice_for_multiline_limit") %></p>
-        <label for="in_tail_setting_formats">formats</label>
-        <textarea id="in_tail_setting_formats" type="text" name="setting[formats]" v-model="params.setting['formats']" v-on="keyup: onKeyup" rows='20' size='100%' class="form-control"></textarea>
-      </div>
-    </div>
-</script>
+<%- add_javascript_pack_tag("in_tail_format") %>
 
 <div id="in_tail_format"
   formatOptionsJson="<%= formats.to_json %>"
@@ -31,11 +7,37 @@
   paramsJson="<%= params.to_json %>"
   >
 
-  <div v-component="format-bundle" wait-for="data-loaded"></div>
+  <div class="form-inline form-group">
+    <label for="in_tail_setting_format">format</label>
+    <select id="in_tail_setting_format" name="setting[format]" v-model="format" class="form-control">
+      <option v-for="selectableFormat in selectableFormats" v-bind:value="selectableFormat" v-bind:selected="format==selectableFormat" v-if="selectableFormats">{{ selectableFormat }}</option>
+    </select>
+  </div>
+  <div class="form-inline form-group" v-for="option in options">
+    <label v-bind:for="'in_tail_setting_' + option" v-if="!useTextArea">{{ option }} </label>
+    <input v-bind:id="'in_tail_setting_' + option" v-bind:type="useTextArea ? 'hidden' : 'text'" v-bind:name="'setting[' + option + ']'" v-model="params.setting[option]" v-on:keyup="onKeyup" size="100%" class="form-control" />
+  </div>
 
-  <pre>{{{ highlightedLines }}}</pre>
+  <div v-if="useTextArea">
+    <div class="form-inline form-group">
+      <label for="in_tail_setting_format_firstline">format_firstline</label>
+      <input id="in_tail_setting_format_firstline" type="text" name="setting[format_firstline]" v-model="params.setting['format_firstline']" v-on:keyup="onKeyup" size="100%" class="form-control" />
+    </div>
+
+    <div class="form-group">
+      <p class="alert alert-warning"><%= t("fluentd.settings.in_tail.notice_for_multiline_limit") %></p>
+      <label for="in_tail_setting_formats">formats</label>
+      <textarea id="in_tail_setting_formats" type="text" name="setting[formats]" v-model="params.setting['formats']" v-on:keyup="onKeyup" rows='20' size='100%' class="form-control"></textarea>
+    </div>
+  </div>
+
+  <div class="card mb-3">
+    <pre class="card-body" v-html="highlightedLines"></pre>
+  </div>
 
-  <div class="well well-sm">
-    <%= raw t('fluentd.settings.in_tail_option_guide') %>
+  <div class="card mb-3">
+    <p class="card-body pb-0">
+      <%= raw t('fluentd.settings.in_tail_option_guide') %>
+    </p>
   </div>
 </div>

data/app/views/shared/vue/_notification.html.erb

@@ -1,14 +1,10 @@
 <!-- vue.js -->
-<li class="dropdown" id="vue-notification">
-  <a
-    class="dropdown-toggle"
-    data-toggle="dropdown" href="#"
-    >
+<li class="nav-item dropdown" id="vue-notification">
+  <a class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" href="#">
     <i class="fa fa-bell fa-fw"></i>
     <span class="badge" v-if="hasAlerts">{{ alertsCount }}</span>
-    <i class="fa fa-caret-down"></i>
   </a>
-  <ul class="nav dropdown-menu dropdown-alerts">
+  <ul class="dropdown-menu" aria-labelledby="alertsDropdown">
     <li v-if="!hasAlerts">
       <a>
         <div class="nothing text text-success">
@@ -17,11 +13,11 @@
         </div>
       </a>
     </li>
-    <li v-repeat="alerts">
+    <li v-for="alert in alerts">
       <a>
         <div>
           <%= icon("fa-cog fa-fw fa-lg fa-spin") %>
-          {{ text }}
+          {{ alert }}
         </div>
       </a>
     </li>

data/app/views/shared/vue/_setting.html.erb

@@ -1,21 +1,23 @@
-<script type="text/template" id="vue-setting-section">
+<%- add_javascript_pack_tag('codemirror') %>
 
-<div class='panel panel-default'>
-  <div class='panel-heading' data-toggle='collapse' href='#{{ id }}' title='{{ content }}'>
+<script type="text/x-template" id="vue-setting-section">
+
+<div class="card card-primary mb-3">
+  <div class="card-header" data-toggle="collapse" v-bind:href="'#'+id" v-bind:title="content">
     {{ type }}
     <span v-if="name == 'match'">({{ arg }})</span>
     <i class="fa fa-caret-down"></i>
   </div>
-  <div class='panel-body collapse' id='{{ id }}'>
+  <div class="card-body collapse" v-bind:id="id">
     <pre v-if="mode != 'edit'">{{ content }}</pre>
     <p v-if="mode == 'edit'">
-      <textarea v-config-editor class="form-control" v-model="editContent" v-attr="disabled: processing"></textarea>
+      <textarea v-config-editor class="form-control" v-model="content" v-bind:disabled="processing"></textarea>
     </p>
-    <p class="pull-right">
-      <button v-if="mode != 'edit'" class="btn btn-default" v-on="click: onEdit"><%= t('terms.edit') %></button>
-      <button v-if="mode != 'edit'" class="btn btn-danger" v-on="click: onDelete"><%= t('terms.destroy') %></button>
-      <button v-if="mode == 'edit'" class="btn btn-default" v-on="click: onCancel"><%= t('terms.cancel') %></button>
-      <button v-if="mode == 'edit'" class="btn btn-primary" v-on="click: onSubmit"><%= t('terms.save') %></button>
+    <p class="float-right">
+      <button v-if="mode != 'edit'" class="btn btn-secondary" v-on:click="onEdit"><%= t('terms.edit') %></button>
+      <button v-if="mode != 'edit'" class="btn btn-danger" v-on:click="onDelete"><%= t('terms.destroy') %></button>
+      <button v-if="mode == 'edit'" class="btn btn-secondary" v-on:click="onCancel"><%= t('terms.cancel') %></button>
+      <button v-if="mode == 'edit'" class="btn btn-primary" v-on:click="onSubmit"><%= t('terms.save') %></button>
     </p>
   </div>
 </div>

data/app/views/shared/vue/_treeview.html.erb

@@ -1,30 +1,33 @@
+<% add_javascript_pack_tag("treeview") %>
 <% name ||= "" %>
 <% action ||= "" %>
 <% submit_button ||= "" %>
 <%= form_tag(action, method: :post) do %>
-  <div id="treeview" initialPath="/var/log">
-    <pre>{{ path }}</pre>
+  <div id="treeview">
+    <div class="card">
+      <pre class="card-body pb-0">{{ path }}</pre>
+    </div>
     <input type="hidden" name="<%= name %>" v-model="path" />
     <div class="dirs">
-      <span v-repeat="currentDirs">
-        <span v-if="$index > 0">
+      <span v-for="(dir, index) in currentDirs">
+        <span v-if="index > 0">
           <%= icon('fa-caret-right') %>
         </span>
-        <span v-on="click: selectPath($value)" class="dir">{{ basename($value) }}</span>
+        <span v-on:click="selectPath(dir)" class="dir">{{ basename(dir) }}</span>
      </span>
    </div>
    <div class="tree">
-     <span v-on="click: selectPath(path)" class="vue-path" v-class="selected: isSelected(path)" v-repeat="paths">
-       <span v-if="is_dir"><%= icon("fa-folder") %></span>
-       <span v-if="!is_dir"><%= icon("fa-file-o") %></span>
-       {{ basename(path) }}
+     <span v-on:click="selectPath(value.path)" class="vue-path" v-bind:class="{ selected: isSelected(value.path) }" v-for="value in paths">
+       <span v-if="value.is_dir"><%= icon("fa-folder") %></span>
+       <span v-if="!value.is_dir"><%= icon("fa-file-o") %></span>
+       {{ basename(value.path) }}
        <br />
      </span>
    </div>
 
    <pre v-if="preview" class="preview">{{ preview }}</pre>
    <p>
-     <%= submit_tag submit_button, class: "btn btn-lg btn-primary pull-right", "v-attr" => "disabled: selectedIsDir", "v-class" => "btn-disable: selectedIsDir" %>
+     <%= submit_tag submit_button, class: "btn btn-lg btn-primary float-right", "v-bind:disabled" => "selectedIsDir" %>
    </p>
   </div>
 <% end %>

data/app/views/tutorials/chapter1.html.erb

@@ -3,7 +3,7 @@
 <% page_title t(".page_title") %>
 
 <p class="clearfix">
-  <%= link_to t('tutorials.chapter2.page_title') << " >>", tutorials_chapter2_path, class: "pull-right" %>
+  <%= link_to t('tutorials.chapter2.page_title') << " >>", tutorials_chapter2_path, class: "float-right" %>
 </p>
 
 <p>
@@ -14,7 +14,7 @@
 <div id="chapter1">
   <form>
     <p v-repeat="payloads">
-      <input type="button" class="btn btn-default" v-on="click: sendRequest($data)" value="<%= t ".send" %>" />
+      <input type="button" class="btn btn-primary" v-on="click: sendRequest($data)" value="<%= t ".send" %>" />
       <code>
         $ curl -X POST http://localhost:<%= @in_http["port"] %>{{ path }} -F 'json={{ data | to_json }}'
       </code>
@@ -26,6 +26,5 @@
 <%= render partial: "shared/vue/fluent_log", locals: { fluentd: @fluentd } %>
 
 <p class="clearfix">
-  <%= link_to t('tutorials.chapter2.page_title') << " >>", tutorials_chapter2_path, class: "pull-right" %>
+  <%= link_to t('tutorials.chapter2.page_title') << " >>", tutorials_chapter2_path, class: "float-right" %>
 </p>
-

data/app/views/tutorials/chapter2.html.haml

@@ -2,11 +2,11 @@
 
 %p.clearfix
   = link_to "<< " << t('tutorials.chapter1.page_title'), tutorials_chapter1_path, class: "pull-left"
-  = link_to t('tutorials.chapter3.page_title') << " >>", tutorials_chapter3_path, class: "pull-right"
+  = link_to t('tutorials.chapter3.page_title') << " >>", tutorials_chapter3_path, class: "float-right"
 
 :markdown
   #{t('.lesson_markdown', http_port: @in_http["port"])}
 
 %p.clearfix
   = link_to "<< " << t('tutorials.chapter1.page_title'), tutorials_chapter1_path, class: "pull-left"
-  = link_to t('tutorials.chapter3.page_title') << " >>", tutorials_chapter3_path, class: "pull-right"
+  = link_to t('tutorials.chapter3.page_title') << " >>", tutorials_chapter3_path, class: "float-right"

data/app/views/tutorials/chapter3.html.haml

@@ -2,11 +2,11 @@
 
 %p.clearfix
   = link_to "<< " << t('tutorials.chapter2.page_title'), tutorials_chapter2_path, class: "pull-left"
-  = link_to t('tutorials.chapter4.page_title') << " >>", tutorials_chapter4_path, class: "pull-right"
+  = link_to t('tutorials.chapter4.page_title') << " >>", tutorials_chapter4_path, class: "float-right"
 
 :markdown
   #{t(".lesson_markdown", edit_config_url: edit_daemon_setting_path(@fluentd))}
 
 %p.clearfix
   = link_to "<< " << t('tutorials.chapter2.page_title'), tutorials_chapter2_path, class: "pull-left"
-  = link_to t('tutorials.chapter4.page_title') << " >>", tutorials_chapter4_path, class: "pull-right"
+  = link_to t('tutorials.chapter4.page_title') << " >>", tutorials_chapter4_path, class: "float-right"

data/app/views/tutorials/chapter4.html.haml

@@ -2,11 +2,11 @@
 
 %p.clearfix
   = link_to "<< " << t('tutorials.chapter3.page_title'), tutorials_chapter3_path, class: "pull-left"
-  = link_to t('tutorials.chapter5.page_title') << " >>", tutorials_chapter5_path, class: "pull-right"
+  = link_to t('tutorials.chapter5.page_title') << " >>", tutorials_chapter5_path, class: "float-right"
 
 :markdown
   #{t ".lesson_markdown"}
 
 %p.clearfix
   = link_to "<< " << t('tutorials.chapter3.page_title'), tutorials_chapter3_path, class: "pull-left"
-  = link_to t('tutorials.chapter5.page_title') << " >>", tutorials_chapter5_path, class: "pull-right"
+  = link_to t('tutorials.chapter5.page_title') << " >>", tutorials_chapter5_path, class: "float-right"

data/app/views/users/show.html.haml

@@ -2,7 +2,7 @@
 
 
 
-.col-xs-6
+.col-xl-6.col-sm-6
   - if notice
     .alert.alert-success= notice
   - else

data/bin/bundle

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')

data/bin/fluentd-ui

@@ -7,6 +7,7 @@ dir = File.expand_path("../../", __FILE__)
 ENV["BUNDLE_GEMFILE"] ||= File.join(dir, "Gemfile.production")
 ENV["SECRET_KEY_BASE"] ||= SecureRandom.hex(64)
 ENV["RAILS_ENV"] ||= "production"
+ENV["RAILS_SERVE_STATIC_FILES"] = "yes"
 
 require File.join(dir, "lib/fluentd-ui/command.rb")
 

data/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/bin/setup

@@ -1,29 +1,28 @@
 #!/usr/bin/env ruby
-require 'pathname'
+require 'fileutils'
+include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 
-Dir.chdir APP_ROOT do
-  # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
 
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
+chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file.
 
-  # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
-  # end
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install --jobs=4 --retry=4')
 
-  puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  # Install JavaScript dependencies if using Yarn
+  system('bin/yarn')
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system! 'bin/rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system! 'bin/rails restart'
 end

data/bin/update

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/bin/webpack

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+require "webpacker"
+require "webpacker/webpack_runner"
+Webpacker::WebpackRunner.run(ARGV)

data/bin/webpack-dev-server

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+require "webpacker"
+require "webpacker/dev_server_runner"
+Webpacker::DevServerRunner.run(ARGV)

data/bin/yarn

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
+  begin
+    exec "yarnpkg", *ARGV
+  rescue Errno::ENOENT
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end

data/config/application.rb

@@ -1,10 +1,15 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
+require "rails"
 # Pick the frameworks you want:
 require "active_model/railtie"
+require "active_job/railtie"
+# require "active_record/railtie"
+# require "active_storage/engine"
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_view/railtie"
+# require "action_cable/engine"
 require "sprockets/railtie"
 # require "rails/test_unit/railtie"
 
@@ -12,21 +17,26 @@ require "sprockets/railtie"
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 # these gems are not required by Bundler.require
+require "font-awesome-rails"
 require "draper"
 require "sass"
 require "haml-rails"
-require "jquery-rails"
 require "sucker_punch"
 require "settingslogic"
 require "kramdown-haml"
 require "jbuilder"
 require "diff/lcs"
+require "webpacker"
 
 module FluentdUi
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.2
+
     # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
+    # Application configuration can go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded after loading
+    # the framework and any gems in your application.
 
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
@@ -35,7 +45,10 @@ module FluentdUi
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     config.i18n.default_locale = 'en'
-    config.autoload_paths += %W(#{config.root}/app/workers #{config.root}/lib)
+    config.i18n.available_locales = %i(en ja)
+    config.autoload_paths += %W(#{config.root}/lib)
+
+    config.active_job.queue_adapter = :sucker_punch
 
     # NOTE: currently, fluentd-ui does not using ActiveRecord, and using Time.now instead of Time.zone.now for each different TZ for users.
     #       If AR will be used, please comment in and check timezone.