fluentd-ui 1.1.0 → 1.2.0

data/app/views/shared/vue/_parser_multiline_form.html.haml

@@ -1,8 +1,10 @@
 %script{type: "text/x-template", id: "vue-parser-multiline-form"}
   .form-group
-    %label{"for" => "setting_parse_0__format_firstline",
-           "data-toggle" => "tooltip",
-           "data-placement" => "right",
+    %b-tooltip{"target" => "label_setting_parse_0__format_firstline",
+               "placement" => "right",
+               "v-bind:title" => "formatFirstlineDesc"}
+    %label{"id" => "label_setting_parse_0__format_firstline",
+           "for" => "setting_parse_0__format_firstline",
            "v-bind:title" => "formatFirstlineDesc"}
       Format first line
     %input.form-control{"type" => "text",

data/app/views/shared/vue/_parser_plugin_form.html.haml

@@ -0,0 +1,40 @@
+= render "shared/vue/parser_multiline_form"
+= render "shared/vue/config_field"
+
+%script{type: "text/x-template", id: "vue-parser-plugin-form"}
+  .form-group.mb-3{"v-bind:id" => "id"}
+    %b-card{"bg-variant" => "light"}
+      %label{"v-bind:for" => "selectId(pluginType)"}
+        {{ pluginLabel }}
+      %select{"v-bind:id" => "selectId(pluginType)",
+              "v-bind:class" => "selectClass(pluginType)",
+              "v-bind:name" => "selectName(pluginType)",
+              "v-model" => "pluginName",
+              "v-on:change" => "onChange"}
+        %option{"v-for" => "option in options",
+                "v-bind:value" => "option",
+                "v-bind:selected" => "pluginName===option"}
+          {{ option }}
+      %parser-multiline-form{"v-if" => 'pluginName==="multiline"',
+                             "v-bind:plugin-type" => "pluginType",
+                             "v-bind:common-options" => "commonOptions",
+                             "v-on:change-formats" => "onChangeFormats"}
+      %template(v-else)
+        %template{"v-for" => "option in commonOptions"}
+          %config-field{"v-bind:key" => "option.name",
+                        "v-bind:plugin-type" => "pluginType",
+                        "v-bind:option" => "option",
+                        "v-bind:initial-text-value" => "initialParams[option.name]",
+                        "v-on:change-parse-config" => "onChangeParseConfig"}
+        %template{"v-if" => '!_.isEmpty(advancedOptions)'}
+          %b-card(no-body){"bg-variant" => "light"}
+            %template{"slot" => "header"}
+              %h4{"v-b-toggle" => '"parser-section-advanced-setting"'}
+                = icon('fa-caret-down')
+                = t('terms.advanced_setting')
+            %b-collapse{"id" => "parser-section-advanced-setting"}
+              %b-card-body
+                %config-field{"v-for" => "option in advancedOptions",
+                              "v-bind:key" => "option.name",
+                              "v-bind:plugin-type" => "pluginType",
+                              "v-bind:option" => "option"}

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

@@ -0,0 +1,20 @@
+- add_javascript_pack_tag('codemirror')
+
+%script{"type" => "text/x-template", "id" => "vue-setting-section"}
+  %b-card.mb-3(no-body){"variant" => "primary"}
+    %template{"slot" => "header"}
+      %div{"data-toggle" => "collapse", "v-bind:href" => "`#${id}`", "v-bind:title" => "content"}
+        = icon("fa-caret-down")
+        {{ type }}
+        %span{"v-if" => '!_.isEmpty(arg) && (name == "match" || name == "filter")'}
+          ({{ arg }})
+    %b-card-body.collapse{"v-bind:id" => "id"}
+      %pre{"v-if" => 'mode !== "edit"'}
+        {{ content }}
+      %p{"v-if" => 'mode === "edit"'}
+        %textarea.form-control(v-config-editor){"v-model.lazy" => "content", "v-bind:disabled" => "processing"}
+      %p.float-right
+        %b-button{"v-if" => 'mode !== "edit"', "variant" => "secondary", "v-on:click" => "onEdit"}=t("terms.edit")
+        %b-button{"v-if" => 'mode !== "edit"', "variant" => "danger", "v-on:click" => "onDelete"}=t("terms.destroy")
+        %b-button{"v-if" => 'mode === "edit"', "variant" => "secondary", "v-on:click" => "onCancel"}=t("terms.cancel")
+        %b-button{"v-if" => 'mode === "edit"', "variant" => "primary", "v-on:click" => "onSubmit"}=t("terms.save")

data/app/views/shared/vue/_sidemenu.html.haml

@@ -0,0 +1,40 @@
+%ul#side-menu.navbar-nav.navbar-sidenav
+  %li.nav-item
+    %b-tooltip{"target" => "side-menu-fluentd", "placement" => "right", "title" => "Fluentd"}
+    %a#side-menu-fluentd.section
+      = icon("fa-puzzle-piece fa-fw") + "fluentd"
+    %ul.sidenav-second-level
+      - if fluentd_exists?
+        %li= link_to_other(t('fluentd.show.page_title'), daemon_path)
+        %li= link_to_other(t('fluentd.settings.source_and_output.page_title'), source_and_output_daemon_setting_path)
+        %li= link_to_other(t('fluentd.settings.show.page_title'), daemon_setting_path)
+        %li= link_to_other(t('fluentd.common.log'), log_daemon_path)
+        %li= link_to_other(t('fluentd.errors.page_title'), errors_daemon_path)
+      - else
+        %li= link_to_other(t('terms.initial_setup'), daemon_path)
+
+  - if fluentd_exists?
+    %li.nav-item
+      %b-tooltip{"target" => "side-menu-plugins", "placement" => "right", "title" => "Plugins"}
+      %a#side-menu-plugins.section
+        = icon("fa-cogs fa-fw") + t("terms.plugins")
+      %ul.sidenav-second-level
+        %li= link_to_other(t("plugins.installed.page_title"), installed_plugins_path)
+        %li= link_to_other(t("plugins.recommended.page_title"), recommended_plugins_path)
+        %li= link_to_other(t("plugins.updated.page_title"), updated_plugins_path)
+
+  %li.nav-item
+    %b-tooltip{"target" => "side-menu-misc", "placement" => "right", "title" => "Misc"}
+    %a#side-menu-misc.section
+      = icon("fa-coffee fa-fw") + t("terms.misc")
+    %ul.sidenav-second-level
+      %li= link_to_other(t("misc.information.page_title"), misc_information_path)
+      %li= link_to_other t('users.show.page_title'), user_path
+
+  %li.nav-item
+    %b-tooltip{"target" => "side-menu-language", "placement" => "right", "title" => "Language"}
+    %a#side-menu-language.section
+      = icon("fa-font") + t("terms.languages")
+    %ul.sidenav-second-level
+      - I18n.available_locales.each do |locale|
+        %li= link_to((locale == current_locale ? icon("fa-check") : "") + language_name(locale), "?lang=#{locale}")

data/app/views/shared/vue/_transport_section.html.haml

@@ -20,11 +20,13 @@
       %template{"v-for" => "option in commonOptions"}
         %config-field{"v-bind:plugin-type" => "pluginType",
                       "v-bind:option" => "option"}
-      .card.card-body.bg-light
-        %h4{"data-toggle" => "collapse", "href" => "#transport-advanced-setting"}
-          = icon('fa-caret-down')
-          = t('terms.advanced_setting') + '(TLS)'
-        #transport-advanced-setting.collapse
-          %template{"v-for" => "option in advancedOptions"}
-            %config-field{"v-bind:plugin-type" => "pluginType",
-                          "v-bind:option" => "option"}
+      %b-card(no-body){"bg-variant" => "light"}
+        %template{"slot" => "header"}
+          %h4{"v-b-toggle" => "'transport-advanced-setting'"}
+            = icon('fa-caret-down')
+            = t('terms.advanced_setting') + '(TLS)'
+        %b-collapse{"id" => "transport-advanced-setting"}
+          %b-card-body
+            %template{"v-for" => "option in advancedOptions"}
+              %config-field{"v-bind:plugin-type" => "pluginType",
+                            "v-bind:option" => "option"}

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

@@ -0,0 +1,30 @@
+:ruby
+  add_javascript_pack_tag("treeview")
+  name ||= ""
+  action ||= ""
+  submit_button ||= ""
+
+= form_tag(action, method: :post) do
+  #treeview
+    %b-card{"variant" => "light"}
+      %pre.pb-0.mb-0
+        {{ path }}
+    %input{"type" => "hidden", "name" => name, "v-model" => "path"}
+    .dirs
+      %span{"v-for" => "(dir, index) in currentDirs"}
+        %span{"v-if" => "index > 0"}= icon("fa-caret-right")
+        %span.dir{"v-on:click" => "selectPath(dir)"}
+          {{ basename(dir) }}
+    .tree
+      %span{"v-on:click" => "selectPath(value.path)",
+            "v-bind:class" => "{ selected: isSelected(value.path) }",
+            "v-for" => "value in paths"}
+        %span{"v-if" => "value.is_dir"}= icon("fa-folder")
+        %span{"v-if" => "!value.is_dir"}= icon("fa-file-o")
+        {{ basename(value.path) }}
+        %br
+
+    %pre.preview{"v-if" => "preview"}
+      {{ preview }}
+    %p.mt-3
+      = submit_tag(submit_button, class: "btn btn-lg btn-primary float-right", "v-bind:disabled" => "selectedIsDir")

data/config/locales/translation_en.yml

@@ -50,6 +50,7 @@ en:
     installing: "Installing: %{target}"
     uninstalling: "Uninstalling: %{target}"
     search: Search
+    clear: Clear
     changeme_password: '<a href="/user">Change the password</a> from default for your security'
     destroy_confirm_title: "%{target} Deletion"
     confirm_body: |

data/config/locales/translation_ja.yml

@@ -50,6 +50,7 @@ ja:
     installing: "インストール中: %{target}"
     uninstalling: "アンインストール中: %{target}"
     search: 検索
+    clear: クリア
     changeme_password: 'パスワードを初期設定から<a href="/user">変更</a>してください'
     destroy_confirm_title: "%{target}を削除"
     confirm_body: |

data/lib/fluentd-ui/version.rb

@@ -1,3 +1,3 @@
 module FluentdUI
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/regexp_preview/multi_line.rb

@@ -47,12 +47,13 @@ module RegexpPreview
             next unless record
             last_pos = 0
             record.each do |key, value|
-              start = chunk.index(value, last_pos)
-              finish = start + value.bytesize
+              v = value.to_s
+              start = chunk.index(v, last_pos)
+              finish = start + v.bytesize
               last_pos = finish
               parsed[:matches] << {
                 key: key,
-                matched: value,
+                matched: v,
                 pos: [start, finish]
               }
             end

data/lib/regexp_preview/single_line.rb

@@ -36,12 +36,13 @@ module RegexpPreview
             next unless record
             last_pos = 0
             record.each do |key, value|
-              start = line.index(value, last_pos)
-              finish = start + value.bytesize
+              v = value.to_s
+              start = line.index(v, last_pos)
+              finish = start + v.bytesize
               last_pos = finish
               parsed[:matches] << {
                 key: key,
-                matched: value,
+                matched: v,
                 pos: [start, finish]
               }
             end

data/package.json

@@ -6,6 +6,7 @@
   },
   "dependencies": {
     "@rails/webpacker": "3.5",
+    "bootstrap-vue": "^2.0.0-rc.11",
     "codemirror": "^5.37.0",
     "es6-promise": "^4.2.4",
     "jquery": "^3.3.1",
@@ -15,7 +16,8 @@
     "startbootstrap-sb-admin": "^4.0.0",
     "vue": "^2.5.16",
     "vue-loader": "14.2.2",
-    "vue-template-compiler": "^2.5.16"
+    "vue-template-compiler": "^2.5.16",
+    "vuex": "^3.0.1"
   },
   "devDependencies": {
     "eslint": "^5.1.0",

data/test/test_helper.rb

@@ -1,4 +1,9 @@
 ENV['RAILS_ENV'] ||= 'test'
+if ENV['RAILS_ENV'] == 'test'
+  require 'simplecov'
+  SimpleCov.start("rails")
+end
+
 require_relative '../config/environment'
 require 'test/unit/rails/test_help'
 require 'test/unit/rr'

data/yarn.lock

@@ -123,6 +123,10 @@ amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
+ansi-escapes@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+
 ansi-escapes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
@@ -725,6 +729,14 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
+babel-polyfill@6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
+  dependencies:
+    babel-runtime "^6.22.0"
+    core-js "^2.4.0"
+    regenerator-runtime "^0.10.0"
+
 babel-polyfill@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
@@ -928,10 +940,25 @@ boom@5.x.x:
   dependencies:
     hoek "4.x.x"
 
+bootstrap-vue@^2.0.0-rc.11:
+  version "2.0.0-rc.11"
+  resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.0.0-rc.11.tgz#47aaa6d2a8d390477de75e636d8ea652b1d03f59"
+  dependencies:
+    bootstrap "^4.1.1"
+    lodash.get "^4.4.2"
+    lodash.startcase "^4.4.0"
+    opencollective "^1.0.3"
+    popper.js "^1.12.9"
+    vue-functional-data-merge "^2.0.5"
+
 bootstrap@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0.tgz#ceb03842c145fcc1b9b4e15da2a05656ba68469a"
 
+bootstrap@^4.1.1:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1181,7 +1208,7 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@^1.1.1, chalk@^1.1.3:
+chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -1958,6 +1985,12 @@ encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
 
+encoding@^0.1.11:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  dependencies:
+    iconv-lite "~0.4.13"
+
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
@@ -2321,7 +2354,7 @@ extend@~3.0.0, extend@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
-external-editor@^2.1.0:
+external-editor@^2.0.1, external-editor@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
   dependencies:
@@ -2994,6 +3027,12 @@ iconv-lite@^0.4.17, iconv-lite@^0.4.4:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@~0.4.13:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
@@ -3070,6 +3109,24 @@ ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
+inquirer@3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
+  dependencies:
+    ansi-escapes "^1.1.0"
+    chalk "^1.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^2.0.1"
+    figures "^2.0.0"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rx "^4.1.0"
+    string-width "^2.0.0"
+    strip-ansi "^3.0.0"
+    through "^2.3.6"
+
 inquirer@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726"
@@ -3346,7 +3403,7 @@ is-resolvable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
 
-is-stream@^1.1.0:
+is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
@@ -3596,6 +3653,10 @@ lodash.clonedeep@^4.3.2:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
 
+lodash.get@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
@@ -3604,6 +3665,10 @@ lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
 
+lodash.startcase@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.startcase/-/lodash.startcase-4.4.0.tgz#9436e34ed26093ed7ffae1936144350915d9add8"
+
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
@@ -3819,7 +3884,7 @@ minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
-minimist@^1.1.3, minimist@^1.2.0:
+minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
@@ -3954,6 +4019,13 @@ nice-try@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4"
 
+node-fetch@1.6.3:
+  version "1.6.3"
+  resolved "http://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
+  dependencies:
+    encoding "^0.1.11"
+    is-stream "^1.0.1"
+
 node-forge@0.7.5:
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
@@ -4187,6 +4259,24 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+opencollective@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1"
+  dependencies:
+    babel-polyfill "6.23.0"
+    chalk "1.1.3"
+    inquirer "3.0.6"
+    minimist "1.2.0"
+    node-fetch "1.6.3"
+    opn "4.0.2"
+
+opn@4.0.2:
+  version "4.0.2"
+  resolved "http://registry.npmjs.org/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
+  dependencies:
+    object-assign "^4.0.1"
+    pinkie-promise "^2.0.0"
+
 opn@^5.1.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
@@ -4425,6 +4515,10 @@ pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
 
+popper.js@^1.12.9:
+  version "1.14.4"
+  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
+
 popper.js@^1.14.3:
   version "1.14.3"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.3.tgz#1438f98d046acf7b4d78cd502bf418ac64d4f095"
@@ -5219,7 +5313,7 @@ regenerate@^1.2.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
 
-regenerator-runtime@^0.10.5:
+regenerator-runtime@^0.10.0, regenerator-runtime@^0.10.5:
   version "0.10.5"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
 
@@ -5451,6 +5545,10 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
+rx@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
+
 rxjs@^5.5.2:
   version "5.5.11"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.11.tgz#f733027ca43e3bec6b994473be4ab98ad43ced87"
@@ -6370,6 +6468,10 @@ vue-eslint-parser@^2.0.3:
     esquery "^1.0.0"
     lodash "^4.17.4"
 
+vue-functional-data-merge@^2.0.5:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/vue-functional-data-merge/-/vue-functional-data-merge-2.0.7.tgz#bdee655181eacdcb1f96ce95a4cc14e75313d1da"
+
 vue-hot-reload-api@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz#97976142405d13d8efae154749e88c4e358cf926"
@@ -6414,6 +6516,10 @@ vue@^2.5.16:
   version "2.5.16"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.16.tgz#07edb75e8412aaeed871ebafa99f4672584a0085"
 
+vuex@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.0.1.tgz#e761352ebe0af537d4bb755a9b9dc4be3df7efd2"
+
 watchpack@^1.4.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"