marty 2.1.5 → 2.3.0

data/app/components/marty/import_view.rb

@@ -0,0 +1,151 @@
+class Marty::ImportView < Marty::Form
+  include Marty::Extras::Layout
+
+  action :apply do |a|
+    a.text    = I18n.t("data_import_view.import")
+    a.tooltip = I18n.t("data_import_view.import")
+    a.icon    = :database_go
+  end
+
+  def parent_model; end
+  def import_model; end
+  def model_view;   end
+
+  def initialize args, kwargs
+    super(args, kwargs)
+    @model_view   = model_view.camelize.constantize   if model_view
+    @parent_model = parent_model.camelize.constantize if parent_model
+    @import_model = import_model.camelize.constantize if import_model
+    @record       = nil
+  end
+
+  client_class do |c|
+    c.set_result = l(<<-JS)
+    function(html) {
+      var result = this.netzkeGetComponent('result');
+      result.updateBodyHtml(html);
+
+      var window      = this.netzkeGetParentComponent();
+      var parent_view = window.netzkeGetParentComponent();
+
+      if (parent_view && parent_view.reload) { parent_view.reload() }
+    }
+    JS
+
+    c.init_component = l(<<-JS)
+    function() {
+      var me = this;
+      me.callParent();
+      var form = me.getForm();
+
+      var window      = this.netzkeGetParentComponent();
+      var parent_view = window.netzkeGetParentComponent();
+
+      this.serverConfig.parent_id = parent_view.serverConfig.parent_id ||
+                                    parent_view.serverConfig.selected;
+
+      var textname = form.findField('import_data');
+      var importbutton = me.actions["apply"].items[0];
+
+      importbutton.on('click', function(t, e, ops) {
+        me.netzkeGetComponent('result').updateBodyHtml('');
+      });
+    }
+    JS
+  end
+
+  ######################################################################
+
+  def validate
+    return client.netzke_notify("Must provide import data.") if
+      @import_data.empty?
+  end
+
+  def process_additional_fields
+    nil
+  end
+
+  def process_import_data
+    CSV.new(@import_data, headers: true, col_sep: "\t")
+  end
+
+  def post_import
+    nil
+  end
+
+  def import data
+    Marty::DataImporter.
+      do_import_summary(@import_model, data, 'infinity', nil, nil)
+  end
+
+  def format_message k, v
+    case k
+    when :clean  then "#{v} record(s) cleaned."
+    when :same   then "#{v} record(s) unchanged."
+    when :create then "#{v} record(s) created."
+    when :update then "#{v} record(s) updated."
+    when :blank  then "#{v} empty lines."
+    end
+  end
+
+  endpoint :submit do |params|
+    return client.netzke_notify "No Model View defined" unless @model_view
+
+    return client.netzke_notify "Permission denied" unless
+      @model_view.can_perform_action?(:update)
+
+    return client.netzke_notify "Can't import when time-warped" if
+      Marty::Util.warped?
+
+    @data        = ActiveSupport::JSON.decode(params[:data])
+    @import_data = @data["import_data"] || ""
+    @record      = @parent_model.try(:find_by_id, client_config['parent_id'])
+
+    validate                  and return
+    process_additional_fields and return
+
+    begin
+      processed = process_import_data
+      res       = import(processed)
+      result    = res.map{|k,v| format_message(k,v)}
+
+      messages  = post_import
+      result << messages if messages
+
+      client.set_result result.join("<br/>")
+
+    rescue Marty::DataImporter::Error => exc
+      result = [
+                "Import failed on line(s): #{exc.lines.join(', ')}",
+                "Error: #{exc.to_s}",
+               ]
+
+      client.set_result '<font color="red">' + result.join("<br/>") + "</font>"
+    rescue => e
+      client.set_result e.message
+    end
+  end
+
+  def configure(c)
+    super
+    c.title = nil
+    c.items =
+      [
+        textarea_field(:import_data,
+                       height: 300,
+                       hide_label: true,
+                       min_width: 10000,
+                      ),
+        :result,
+      ]
+  end
+
+  component :result do |c|
+    c.klass       = Marty::Panel
+    c.title       = I18n.t("data_import_view.results")
+    c.html        = ""
+    c.flex        = 1
+    c.min_height  = 150
+    c.scrollable = true
+  end
+end

data/app/components/marty/main_auth_app.rb

@@ -30,7 +30,7 @@ class Marty::MainAuthApp < Marty::AuthApp
       text:  warped ? "#{Marty::Util.get_posting.name}" : I18n.t("postings"),
       name:  "posting",
       tooltip: "Postings",
-      icon:  icon_hack(:time),
+      icon_cls: "fa fa-clock glyph",
       style: (warped ? "background-color: lightGrey;" : ""),
       menu:  [
         :new_posting,
@@ -44,7 +44,7 @@ class Marty::MainAuthApp < Marty::AuthApp
     [
       {
         text: 'Log Maintenance',
-        icon:  icon_hack(:wrench),
+        icon_cls: "fa fa-wrench glyph",
         disabled: !self.class.has_admin_perm?,
         menu: [
           :log_view,
@@ -58,7 +58,7 @@ class Marty::MainAuthApp < Marty::AuthApp
     [
       {
         text: 'API Management',
-        icon:  icon_hack(:wrench),
+        icon_cls: "fa fa-wrench glyph",
         disabled: !self.class.has_admin_perm?,
         menu: [
           :api_auth_view,
@@ -72,7 +72,7 @@ class Marty::MainAuthApp < Marty::AuthApp
   def system_menu
     {
       text:  I18n.t("system"),
-      icon:  icon_hack(:wrench),
+      icon_cls: "fa fa-wrench glyph",
       style: "",
       menu:  [
         :import_type_view,
@@ -88,7 +88,7 @@ class Marty::MainAuthApp < Marty::AuthApp
   def applications_menu
     {
       text: I18n.t("applications"),
-      icon: icon_hack(:application_cascade),
+        icon_cls: "fa fa-window-restore glyph",
       menu: [
         :data_grid_view,
         :reporting,
@@ -102,7 +102,7 @@ class Marty::MainAuthApp < Marty::AuthApp
     [
       {
         text: 'Background Jobs',
-        icon: icon_hack(:clock),
+        icon_cls: "fa fa-user-clock glyph",
         disabled: !self.class.has_admin_perm?,
         menu: [
           :bg_status,
@@ -131,7 +131,7 @@ class Marty::MainAuthApp < Marty::AuthApp
   end
 
   def ident_menu
-    "<span style='color:#3333FF;
+    "<span style='color:#157fcc;
         background-color:#{warped ? '#FBDF4F' : ''};
         font-size:120%;
         font-weight:bold;'>#{app_title}</span>"
@@ -160,34 +160,34 @@ class Marty::MainAuthApp < Marty::AuthApp
     a.text      = I18n.t("import_type")
     a.handler   = :netzke_load_component_by_action
     a.disabled  = !self.class.has_admin_perm?
-    a.icon      = :table_go
+    a.icon_cls   = "fa fa-file-import glyph"
   end
 
   action :scripting do |a|
     a.text      = I18n.t("scripting")
     a.handler   = :netzke_load_component_by_action
-    a.icon      = :script
+    a.icon_cls   = "fa fa-code glyph"
     a.disabled  = !self.class.has_any_perm?
   end
 
   action :reporting do |a|
     a.text      = I18n.t("reports")
     a.handler   = :netzke_load_component_by_action
-    a.icon      = :page_lightning
+    a.icon_cls   = "fa fa-file-alt glyph"
     a.disabled  = !self.class.has_any_perm?
   end
 
   action :promise_view do |a|
     a.text      = I18n.t("jobs.promise_view")
     a.handler   = :netzke_load_component_by_action
-    a.icon      = :report_magnify
+    a.icon_cls   = "fa fa-search glyph"
     a.disabled  = !self.class.has_any_perm?
   end
 
   action :user_view do |a|
     a.text      = I18n.t("user_view")
     a.handler   = :netzke_load_component_by_action
-    a.icon      = :group
+    a.icon_cls   = "fa fa-users glyph"
     a.disabled  = !self.class.has_admin_perm? &&
       !self.class.has_user_manager_perm?
   end
@@ -195,14 +195,14 @@ class Marty::MainAuthApp < Marty::AuthApp
   action :event_view do |a|
     a.text      = I18n.t("event_view")
     a.handler   = :netzke_load_component_by_action
-    a.icon      = :application_view_list
+    a.icon_cls   = "fa fa-bolt glyph"
     a.disabled  = !self.class.has_admin_perm?
   end
 
   action :config_view do |a|
     a.text      = I18n.t("config_view")
     a.handler   = :netzke_load_component_by_action
-    a.icon      = :cog
+    a.icon_cls   = "fa fa-cog glyph"
     a.disabled  = !self.class.has_admin_perm? &&
       !self.class.has_user_manager_perm?
   end
@@ -210,63 +210,63 @@ class Marty::MainAuthApp < Marty::AuthApp
   action :api_auth_view do |a|
     a.text      = 'API Auth Management'
     a.handler   = :netzke_load_component_by_action
-    a.icon      = :script_key
+    a.icon_cls   = "fa fa-key glyph"
     a.disabled  = !self.class.has_admin_perm?
   end
 
   action :api_config_view do |a|
     a.text      = 'API Config Management'
     a.handler   = :netzke_load_component_by_action
-    a.icon      = :script_key
+    a.icon_cls   = "fa fa-cogs glyph"
     a.disabled  = !self.class.has_admin_perm?
   end
 
   action :api_log_view do |a|
     a.text      = 'API Log View'
     a.handler   = :netzke_load_component_by_action
-    a.icon      = :script_key
+    a.icon_cls   = "fa fa-cogs glyph"
     a.disabled  = !self.class.has_admin_perm?
   end
 
   action :data_grid_view do |a|
     a.text      = I18n.t("data_grid_view", default: "Data Grids")
     a.handler   = :netzke_load_component_by_action
-    a.icon      = :table_multiple
+    a.icon_cls   = "fa fa-table glyph"
     a.disabled  = !self.class.has_any_perm?
   end
 
   action :reload_scripts do |a|
     a.text     = 'Reload Scripts'
     a.tooltip  = 'Reload and tag Delorean scripts'
-    a.icon     = :arrow_refresh
+    a.icon_cls   = "fa fa-sync-alt glyph"
     a.disabled = !self.class.has_admin_perm?
   end
 
   action :load_seed do |a|
     a.text     = 'Load Seeds'
     a.tooltip  = 'Load Seeds'
-    a.icon     = :arrow_rotate_clockwise
+    a.icon_cls   = "fa fa-retweet glyph"
     a.disabled = !self.class.has_admin_perm?
   end
 
   action :bg_status do |a|
     a.text     = 'Show Delayed Jobs Status'
     a.tooltip  = 'Run delayed_job status script'
-    a.icon     = :monitor
+    a.icon_cls   = "fa fa-desktop glyph"
     a.disabled = !self.class.has_admin_perm?
   end
 
   action :bg_stop do |a|
     a.text     = 'Stop Delayed Jobs'
     a.tooltip  = 'Run delayed_job stop script'
-    a.icon     = :stop
+    a.icon_cls   = "fa fa-skull glyph"
     a.disabled = !self.class.has_admin_perm?
   end
 
   action :bg_restart do |a|
     a.text     = 'Restart Delayed Jobs'
     a.tooltip  = 'Run delayed_job restart script using DELAYED_JOB_PARAMS'
-    a.icon     = :arrow_rotate_clockwise
+    a.icon_cls   = "fa fa-power-off glyph"
     a.disabled = !self.class.has_admin_perm?
   end
 
@@ -274,14 +274,14 @@ class Marty::MainAuthApp < Marty::AuthApp
     a.text     = 'View Log'
     a.tooltip  = 'View Log'
     a.handler  = :netzke_load_component_by_action
-    a.icon      = :cog
+    a.icon_cls   = "fa fa-cog glyph"
     a.disabled = !self.class.has_admin_perm?
   end
 
   action :log_cleanup do |a|
     a.text     = 'Cleanup Log Table'
     a.tooltip  = 'Delete old log records'
-    a.icon      = :cog
+    a.icon_cls   = "fa fa-cog glyph"
     a.disabled = !self.class.has_admin_perm?
   end
 
@@ -333,7 +333,7 @@ class Marty::MainAuthApp < Marty::AuthApp
   action :new_posting do |a|
     a.text      = I18n.t('new_posting')
     a.tooltip   = I18n.t('new_posting')
-    a.icon      = :time_add
+    a.icon_cls   = "fa fa-plus glyph"
     a.disabled  = Marty::Util.warped? || !self.class.has_posting_perm?
   end
 
@@ -486,7 +486,7 @@ class Marty::MainAuthApp < Marty::AuthApp
   action :select_posting do |a|
     a.text      = I18n.t('select_posting')
     a.tooltip   = I18n.t('select_posting')
-    a.icon      = :timeline_marker
+    a.icon_cls   = "fa fa-history glyph"
   end
 
   endpoint :select_posting do |params|
@@ -500,7 +500,7 @@ class Marty::MainAuthApp < Marty::AuthApp
 
   action :select_now do |a|
     a.text      = I18n.t('go_to_now')
-    a.icon      = :arrow_in
+    a.icon_cls   = "fa fa-globe glyph"
     a.disabled  = Marty::Util.get_posting_time == Float::INFINITY
   end
 

data/app/components/marty/mcfly_grid_panel.rb

@@ -65,7 +65,7 @@ class Marty::McflyGridPanel < Marty::Grid
 
   action :dup_in_form do |a|
     a.hidden   = !config[:permissions][:create]
-    a.icon     = :page_copy
+    a.icon_cls = "fa fa-copy glyph"
     a.disabled = true
   end
 

data/app/components/marty/new_posting_form.rb

@@ -14,9 +14,9 @@ class Marty::NewPostingForm < Marty::Form
   end
 
   action :apply do |a|
-    a.text    = I18n.t("create_posting")
-    a.tooltip = I18n.t("create_posting")
-    a.icon    = :time_add
+    a.text     = I18n.t("create_posting")
+    a.tooltip  = I18n.t("create_posting")
+    a.icon_cls = 'fa fa-clock glyph'
   end
 
   ######################################################################

data/app/components/marty/new_posting_window.rb

@@ -4,12 +4,11 @@ class Marty::NewPostingWindow < Netzke::Window::Base
   def configure(c)
     super
 
-    c.title             = I18n.t('new_posting')
-    c.modal             = true
-    c.items             = [:new_posting_form]
-    c.lazy_loading      = true
-    c.width             = 350
-    c.height            = 130
+    c.title        = I18n.t('new_posting')
+    c.modal        = true
+    c.items        = [:new_posting_form]
+    c.layout       = 'fit'
+    c.lazy_loading = true
   end
 
   component :new_posting_form do |c|

data/app/components/marty/posting_grid.rb

@@ -17,7 +17,7 @@ class Marty::PostingGrid < Marty::Grid
   action :delete do |a|
     a.text      = "Select"
     a.tooltip   = "Select"
-    a.icon      = :time_go
+    a.icon_cls  = "fa fa-clock glyph"
     a.disabled  = true
   end
 
@@ -82,7 +82,7 @@ class Marty::PostingGrid < Marty::Grid
 
   action :detail do |a|
     a.text      = "Detail"
-    a.icon      = :application_view_detail
+    a.icon_cls  = "fa fa-th-large glyph"
     a.handler   = :detail
     a.disabled  = true
   end

data/app/components/marty/posting_window.rb

@@ -6,7 +6,7 @@ class Marty::PostingWindow < Netzke::Window::Base
     c.modal 		= true
     c.items 		= [:posting_grid]
     c.lazy_loading 	= true
-    c.width 		= 400
+    c.width 		= 600
     c.height 		= 350
   end
 
@@ -20,7 +20,6 @@ class Marty::PostingWindow < Netzke::Window::Base
     }
     # c.bbar	= []
   end
-
 end
 
 PostingWindow = Marty::PostingWindow